diff --git a/src/cc/rogue/command.c b/src/cc/rogue/command.c
index e78e6b055..9446d704f 100644
--- a/src/cc/rogue/command.c
+++ b/src/cc/rogue/command.c
@@ -312,8 +312,9 @@ over:
 		    after = FALSE;
 		    msg(rs,"version %s. (mctesq was here)", release);
 		when 'S': 
-		    after = FALSE;
-		    save_game(rs);
+            msg(rs,"Saving is disabled, use bailout rpc");
+            after = FALSE;
+		    //save_game(rs);
 		when '.': ;			/* Rest command */
 		when ' ': after = FALSE;	/* "Legal" illegal command */
 		when '^':
diff --git a/src/cc/rogue/extern.c b/src/cc/rogue/extern.c
index b84e6fa7b..39a48b23f 100644
--- a/src/cc/rogue/extern.c
+++ b/src/cc/rogue/extern.c
@@ -452,7 +452,7 @@ void externs_clear()
     memset(p_colors,0,sizeof(p_colors));
     memset(prbuf,0,sizeof(prbuf));
     memset(r_stones,0,sizeof(r_stones));
-    memset(whoami,0,sizeof(whoami));
+    //memset(whoami,0,sizeof(whoami));
     memset(ws_made,0,sizeof(ws_made));
     memset(ws_type,0,sizeof(ws_type));
     runch = 0;				/* Direction player is running */
diff --git a/src/cc/rogue/rogue.c b/src/cc/rogue/rogue.c
index b4b1b7d15..038ce3b0b 100644
--- a/src/cc/rogue/rogue.c
+++ b/src/cc/rogue/rogue.c
@@ -365,8 +365,8 @@ int rogue(int argc, char **argv, char **envp)
 
     if ((env = getenv("ROGUEOPTS")) != NULL)
         parse_opts(env);
-    if (env == NULL || whoami[0] == '\0')
-        strucpy(whoami, md_getusername(), (int) strlen(md_getusername()));
+    //if (env == NULL || whoami[0] == '\0')
+    //    strucpy(whoami, md_getusername(), (int) strlen(md_getusername()));
     lowtime = (int) time(NULL);
 #ifdef MASTER
     if (wizard && getenv("SEED") != NULL)