diff --git a/script-user-reset-password b/script-user-reset-password
index 33fd02ac..08b7eedc 100755
--- a/script-user-reset-password
+++ b/script-user-reset-password
@@ -32,10 +32,11 @@ password="${password:-$user}" # For samba
 
 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?" || exit
-(echo "$password"; echo "$password") | smbpasswd -a -s "$user"
+ask_ok "Require user $user to reset password on next login?" && 
+    passwd --expire "$user"
 
-exit $?
+ask_ok "Change user $user's Samba password to $password?" &&
+    (echo "$password"; echo "$password") | smbpasswd -a -s "$user"
+
+exit 0