diff --git a/ChangeLog b/ChangeLog
index 109f7d26..98fafe1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@ v0.39.1		22-Oct-2003
 		~/etc/archiver.data and start mbsetup to recreate the
 		archivers setup.
 
+	mbsebbs:
+		Fixed a bug where the bbs goes into a loop after idle timeout
+		during login (and maybe in other situations).
+
 	mbsetup:
 		In node editor, fixed error message when there was no more
 		room for new nodes to point to the right menus.
diff --git a/TODO b/TODO
index f1c06dc0..761ca416 100644
--- a/TODO
+++ b/TODO
@@ -30,9 +30,6 @@ libdiesel.a:
 	   processed, instead the previous macro value will be returned.
 
 mbsebbs:
-	U: When the bbs times out during login, the GoodBye functions goes
-	   into a loop.
-
 	X: Better word wrapping or paragraph justification in editor.
 
 	X: E-mail downloads with e-mail verification.
diff --git a/mbsebbs/bye.c b/mbsebbs/bye.c
index 2cea913f..584cbb98 100644
--- a/mbsebbs/bye.c
+++ b/mbsebbs/bye.c
@@ -57,18 +57,19 @@ void Good_Bye(int onsig)
 
     IsDoing("Hangup");
     temp = calloc(PATH_MAX, sizeof(char));
-    Syslog('+', "Good_Bye()");
+    Syslog('+', "Good_Bye(%d)", onsig);
 
-    if (onsig != SIGHUP)
+    /*
+     * Don't display goodbye screen on SIGHUP and idle timeout.
+     * With idle timeout this will go into a loop.
+     */
+    if ((onsig != SIGHUP) && (onsig != SIGALRM) && (onsig != MBERR_TIMEOUT))
 	DisplayFile((char *)"goodbye");
 
-    Syslog('b', "goodbye displayed");
-
     if (do_mailout)
 	CreateSema((char *)"mailout");
 
     SaveLastCallers();
-    Syslog('b', "Lastcallers written");
 
     /*
      * Update the users database record.