diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index eb4407de..a9e04344 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -1,21 +1,36 @@
 // Decides whether to open the admin or normal in-game menu.
 const ingamemenu [ if (player1 role) [ showmenu [In-game admin] ] [ showmenu In-game ] ]
 
+const ifauthsetup [
+    if (authsetup) [
+        $arg1
+    ] [
+        checkaccount
+    ]
+]
+
 // "Join server" menu.
 personalserverlist = []
 const joinservermenu [
-  if (authsetup) [
       searchlan 1
       showallservers 1
       showonlyfavourites 0
       updatefrommaster
       personalserverlist
       showmenu server
-  ] [
-      checkaccount
-  ]
 ]
 
+const joinlanservermenu [
+      searchlan 2
+      showallservers 0
+      showonlyfavourites 0
+      showmenu server 
+]
+
+const customconnectmenu [ showmenu [Custom connect] ]
+const adminconnectmenu [ showmenu [Admin connect] ]
+
+
 // Common parts of in-game menus
 tempalias __ingamemenu_1 [
     push t (player1 team)
@@ -32,7 +47,7 @@ tempalias __ingamemenu_2 [
     menuitem "Download a demo\i\3"                [ listdemos; showmenu [Download demo] ]
     menuitem "" -1
     menuitem "\f4Main menu\i\3"                   [ closecurmenu; showmenu main ]
-    menuitem "\f4Browse servers\i\3"              [ closecurmenu; joinservermenu ]
+    menuitem "\f4Browse servers\i\3"              [ closecurmenu; ifauthsetup joinservermenu ]
     menuitem "\f3Disconnect from server"           disconnect
     menuitem "\f3Quit AssaultCube"                 savequit
 ]
@@ -152,13 +167,13 @@ menuitem [Lock the server (match mode)] [ mastermode 2 ]
 ////  Main > Multiplayer  //// (Multiplayer menu only opens through the main menu (when disconnected).)
 
 newmenu multiplayer
-menuitem [Join a server]     joinservermenu
-menuitem [Join a LAN server] [ searchlan 2; showallservers 0; showonlyfavourites 0; showmenu server ]
-menuitem [Custom connect]    [ showmenu [Custom connect] ]
-menuitem [Connect as Admin]  [ showmenu [Admin connect] ]
+menuitem [Join a server]     [ ifauthsetup joinservermenu ]
+menuitem [Join a LAN server] [ ifauthsetup joinlanservermenu ]
+menuitem [Custom connect]    [ ifauthsetup customconnectmenu ]
+menuitem [Connect as Admin]  [ ifauthsetup adminconnectmenu ]
 menuitem [] -1
 menuitem [Reset game account] [ showmenu [create game account] ]
-menuitem [Force serverlist update] [ updatefrommaster 1; joinservermenu ]
+menuitem [Force serverlist update] [ updatefrommaster 1; ifauthsetup joinservermenu ]
 
 ////  Main > Multiplayer > Custom connect  ////
 
@@ -338,7 +353,7 @@ menuitem "\t\t\f0[Ok]" [
             authsetup genpre 
             authsetup genpriv 
             authsetup genpub
-            if (= $___rememberpass 1) [ alias savedpass $___pass ] [ alias savedpass 0 ]
+            if (= $___rememberpass 1) [ alias savedpass $___pass ] [ if (checkalias savedpass) [ delalias savedpass ] ]
             closecurmenu
             showmenu "progress"
         ]
@@ -382,7 +397,7 @@ const checkaccount [
         exec config/authprivate.cfg 
     ]
     if (authsetup needpass) [
-        if (!= $savedpass 0) [
+        if (checkalias savedpass) [
             // try the saved password if there is one
             authsetup passd $savedpass
         ] [