diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 5ad2e92a..ea8077d6 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2770,11 +2770,21 @@ static void Command_BanIP(void)
 	if (server) // Only the server can use this, otherwise does nothing.
 	{
 		const char *address = (COM_Argv(1));
-		const char *reason = (COM_Argv(2));
+		const char *reason;
+
+		if (COM_Argc() == 2)
+			reason = NULL;
+		else
+			reason = COM_Argv(2);
+
 
 		if (I_SetBanAddress && I_SetBanAddress(address, NULL))
 		{
-			CONS_Printf("Banned ip address for:%s\n", reason);
+			if (reason)
+				CONS_Printf("Banned ip address %s for: %s\n", address, reason);
+			else
+				CONS_Printf("Banned ip address %s\n", address);
+
 			Ban_Add(reason);
 			D_SaveBan();
 		}
diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index 5970f5ae..bc3c8b2b 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -615,6 +615,9 @@ void I_Quit (void)
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
 	M_SaveConfig (NULL);   //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	if (demorecording)
 		G_CheckDemoStatus();
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 6d72d9bb..f360072a 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -3054,6 +3054,9 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(false); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index a841860f..d055a4ca 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -2975,6 +2975,9 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.