diff --git a/src/freedombone-sec b/src/freedombone-sec
index 06f9ad94..62ea1717 100755
--- a/src/freedombone-sec
+++ b/src/freedombone-sec
@@ -205,16 +205,9 @@ function change_xmpp_settings {
 }
 
 function allow_ssh_passwords {
-    if [[ $SSH_PASSWORDS == "yes" ]]; then
-        dialog --title $"SSH Passwords" \
-               --backtitle $"Freedombone Security Configuration" \
-               --yesno $"\nAllow SSH login using passwords?" 7 60
-    else
-        dialog --title $"SSH Passwords" \
-               --backtitle $"Freedombone Security Configuration" \
-               --defaultno \
-               --yesno $"\nAllow SSH login using passwords?" 7 60
-    fi
+    dialog --title $"SSH Passwords" \
+           --backtitle $"Freedombone Security Configuration" \
+           --yesno $"\nAllow SSH login using passwords?" 7 60
     sel=$?
     case $sel in
         0) SSH_PASSWORDS="yes";;
@@ -738,6 +731,8 @@ function menu_security_settings {
             ;;
         8)
             allow_ssh_passwords
+            change_ssh_settings
+            exit 0
             ;;
         9)
             exit 0