diff --git a/script-user-reset-password b/script-user-reset-password
index c70f02aa..c018b458 100755
--- a/script-user-reset-password
+++ b/script-user-reset-password
@@ -26,12 +26,12 @@ fi
 
 password="${password:$user}" # For samba
 
-ask_ok "Change user $user's password to $password?" || exit 1
+ask_ok "Change user $user's password to $password?" || exit
 echo "$user":"$password" | chpasswd
 echo "Expiring user password"
 passwd --expire "$user"
 
-ask_ok "Change user $user's Samba password to $password?" &&
-    (echo "$password"; echo "$password") | smbpasswd -a -s "$user"
+ask_ok "Change user $user's Samba password to $password?" || exit
+(echo "$password"; echo "$password") | smbpasswd -a -s "$user"
 
 exit $?