diff --git a/script-user-reset-password b/script-user-reset-password
index 826dcc3c..3d3ecc4d 100755
--- a/script-user-reset-password
+++ b/script-user-reset-password
@@ -9,13 +9,13 @@ parent=${parent%/*}
 
 is_root
 
-[[ $? -lt 1 ]] && echo "Must provide a username" && exit 1
+[[ $# -lt 1 ]] && echo "Must provide a username" && exit 1
 
-[[ $? -gt 1 ]] && user="$1"
+[[ $# -gt 1 ]] && user="$1"
 
-[[ $? -eq 2 ]] && password="$2"
+[[ $# -eq 2 ]] && password="$2"
 
-[[ $? -gt 2 ]] && "Too many arguments" && exit 1
+[[ $# -gt 2 ]] && "Too many arguments" && exit 1
 
 if ! id -u "$user"; then
     echo "User $user does not exist"
@@ -24,7 +24,7 @@ fi
 
 password="${password:$user}" # For samba
 
-ask_ok "Change user $user's password to $password?"
+ask_ok "Change user $user's password to $password?" || exit 1
 echo "$user":"$password" | chpasswd
 echo "Expiring user password"
 passwd --expire "$user"