diff --git a/modules.d/99base/initqueue b/modules.d/99base/initqueue
index b2d44061..288d4f9a 100755
--- a/modules.d/99base/initqueue
+++ b/modules.d/99base/initqueue
@@ -5,28 +5,29 @@
 while [ $# -gt 0 ]; do
     case "$1" in
 	--onetime)
-	    onetime="yes"
-	    shift;;
+	    onetime="yes";;
 	--settled)
-	    settled="-settled"
-	    shift;;
+	    settled="-settled";;
 	--unique)
-	    unique="yes"
-	    shift;;
+	    unique="yes";;
+	--name)
+	    name="$2";shift;;
 	*)
 	    break;;
     esac
+    shift
 done
 
 if [ -z "$unique" ]; then
-	job=$$
+	job="${name}$$"
 else
-	job=${1##*/}
+	job="${name:-$1}"
+	job=${job##*/}
 fi
 
-echo "$@" > /tmp/${job}.sh
+echo "$@" > "/tmp/${job}.sh"
 if [ -n "$onetime" ]; then
-   echo '[ -e "$job" ] && rm "$job"' >> /tmp/${job}.sh
+   echo '[ -e "$job" ] && rm "$job"' >> "/tmp/${job}.sh"
 fi
-mv -f /tmp/${job}.sh /initqueue${settled}/
+mv -f "/tmp/${job}.sh" /initqueue${settled}/
 [ -z "$settled" ] && >> /initqueue/work