diff --git a/koji-setup/koji-add-user.sh b/koji-setup/koji-add-user.sh
index e42202a..f4c6998 100644
--- a/koji-setup/koji-add-user.sh
+++ b/koji-setup/koji-add-user.sh
@@ -4,15 +4,17 @@ set -e
 DEBUG=
 SILENT="-s"
 QUIET="-q"
-for param in $1 $2 $3 ; do
+for param in "$@" ; do
   if [ $param ] ; then
     case $param in
 	    debug )
 		    DEBUG="debug" ;;
-        permission=* )
-            NEW_PERMS=${param#*=} ;;
-        * )
-            NEW_USER=$param ;;
+      permission=* )
+        NEW_PERMS=${param#*=} ;;
+      help | -h | --help )
+        echo "koji-add-user.sh <user> [permission=<permission> | debug]" ;;
+      * )
+        NEW_USER=$param ;;
     esac
   else
 	  break