diff --git a/dgamelaunch.c b/dgamelaunch.c
index 53646b4..7a2944c 100644
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -482,7 +482,7 @@ inprogressmenu ()
       clear ();
       drawbanner (1, 1);
       mvprintw (3, 1,
-                "During playback, hit 'q' to return here, 'm' to send mail (requires login");
+                "During playback, hit 'q' to return here, 'm' to send mail (requires login)");
       mvaddstr (4, 1,
                 "(Use capital letter of selection to strip DEC graphics, VERY experimental!)");
       mvaddstr (5, 1, "The following games are in progress:");
@@ -846,6 +846,12 @@ loginprompt (int from_ttyplay)
       loggedin = 1;
       snprintf (rcfilename, 80, "%srcfiles/%s.nethackrc", myconfig->dglroot, me->username);
     }
+  else if (from_ttyplay == 1)
+  {
+    mvaddstr(9, 1, "Login failed. Returning to game.");
+    refresh();
+    sleep(2);
+  }
 }
 
 /* ************************************************************* */
diff --git a/ttyplay.c b/ttyplay.c
index df2409b..08b3d67 100644
--- a/ttyplay.c
+++ b/ttyplay.c
@@ -198,13 +198,15 @@ ttypread (FILE * fp, Header * h, char **buf, int pread)
 	      {
 		initcurses();
 		loginprompt(1);
+		if (!loggedin) return READ_RESTART;
 	      }
               if (loggedin)
-                {
-                  initcurses ();
-                  domailuser (chosen_name);
-                  return READ_RESTART;
-                }
+	      {
+		initcurses ();
+		domailuser (chosen_name);
+                return READ_RESTART;
+	      }
+	      
               break;
             }
         }