diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index cefce8c1..eb4407de 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -333,12 +333,16 @@ menuitem "" -1
 menuitemradio "Remember game account password: " 0 1 [ ] [ "No (recommended)" "Yes"] [ ___rememberpass = (= $arg1 1)]
 menuitem "" -1
 menuitem "\t\t\f0[Ok]" [ 
-    authsetup genpre 
-    authsetup genpriv 
-    authsetup genpub
-    if (= $___rememberpass 1) [ alias savedpass $___pass ] [ alias savedpass 0 ]
-    closecurmenu
-    showmenu "progress"
+    if (strcmp $___ppass "") [ menuselection (curmenu) 0; -1 ] [
+        if (strcmp $___pass "") [ menuselection (curmenu) 1; -1 ] [
+            authsetup genpre 
+            authsetup genpriv 
+            authsetup genpub
+            if (= $___rememberpass 1) [ alias savedpass $___pass ] [ alias savedpass 0 ]
+            closecurmenu
+            showmenu "progress"
+        ]
+    ]
 ]
 
 newmenu "progress"