diff --git a/exec/logon.js b/exec/logon.js
index 0e569eeafc457d36ba24a3587254526a55a02cea..265e9525d2be1dcefd6ab78143e90177684ebac7 100644
--- a/exec/logon.js
+++ b/exec/logon.js
@@ -124,6 +124,17 @@ if(random_list.length)
 console.clear();
 bbs.user_event(EVENT_LOGON);
 
+if(user.security.level==99				/* Sysop logging on */
+	&& !system.matchuser("guest")		/* Guest account does not yet exist */
+	&& user.security.flags4&UFLAG_G		/* Sysop has not asked to stop this question */
+	) {
+	if(console.yesno("Create Guest/Anonymous user account (highly recommended)"))
+		load("makeguest.js");
+	else if(!console.yesno("Ask again later"))
+		user.security.flags4&=~UFLAG_G;	/* Turn off flag 4G to not ask again */
+	console.crlf();
+}
+
 /*
 	* Disable HTML mode if not using an HTML shell
 	* If you don't do this, you'll get HTML menus that flash on
@@ -228,21 +239,6 @@ else {
 	}
 }
 
-// Automatically set shell to WIPSHELL
-if(user.settings&USER_WIP)
-	user.command_shell="WIPSHELL";
-
-if(user.security.level==99				/* Sysop logging on */
-	&& !system.matchuser("guest")		/* Guest account does not yet exist */
-	&& user.security.flags4&UFLAG_G		/* Sysop has not asked to stop this question */
-	) {
-	if(console.yesno("Create Guest/Anonymous user account (highly recommended)"))
-		load("makeguest.js");
-	else if(!console.yesno("Ask again later"))
-		user.security.flags4&=~UFLAG_G;	/* Turn off flag 4G to not ask again */
-	console.crlf();
-}
-
 // Set rlogin_xtrn_menu=true in [logon] section of ctrl/modopts.ini
 // if you want your RLogin server to act as a door game server only
 if(options