diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index d28724087..ce27e46fa 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1269,7 +1269,7 @@ void CClient::PumpNetwork()
 	if(State() != IClient::STATE_DEMOPLAYBACK)
 	{
 		// check for errors
-		if(State() != IClient::STATE_OFFLINE && m_NetClient.State() == NETSTATE_OFFLINE)
+		if(State() != IClient::STATE_OFFLINE && State() != IClient::STATE_QUITING && m_NetClient.State() == NETSTATE_OFFLINE)
 		{
 			SetState(IClient::STATE_OFFLINE);
 			Disconnect();
@@ -1922,8 +1922,8 @@ void CClient::RegisterCommands()
 	m_pConsole->Register("stoprecord", "", CFGFLAG_SERVER, 0, 0, "Stop recording");
 	m_pConsole->Register("reload", "", CFGFLAG_SERVER, 0, 0, "Reload the map");
 
-	m_pConsole->Register("quit", "", CFGFLAG_CLIENT, Con_Quit, this, "Quit Teeworlds");
-	m_pConsole->Register("exit", "", CFGFLAG_CLIENT, Con_Quit, this, "Quit Teeworlds");
+	m_pConsole->Register("quit", "", CFGFLAG_CLIENT|CFGFLAG_STORE, Con_Quit, this, "Quit Teeworlds");
+	m_pConsole->Register("exit", "", CFGFLAG_CLIENT|CFGFLAG_STORE, Con_Quit, this, "Quit Teeworlds");
 	m_pConsole->Register("minimize", "", CFGFLAG_CLIENT|CFGFLAG_STORE, Con_Minimize, this, "Minimize Teeworlds");
 	m_pConsole->Register("connect", "s", CFGFLAG_CLIENT, Con_Connect, this, "Connect to the specified host/ip");
 	m_pConsole->Register("disconnect", "", CFGFLAG_CLIENT, Con_Disconnect, this, "Disconnect from the server");
diff --git a/src/engine/server/register.h b/src/engine/server/register.h
index dbface3c4..185ac84c4 100644
--- a/src/engine/server/register.h
+++ b/src/engine/server/register.h
@@ -47,4 +47,4 @@ public:
 	int RegisterProcessPacket(class CNetChunk *pPacket);
 };
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/game/client/components/scoreboard.cpp b/src/game/client/components/scoreboard.cpp
index 9558c840d..27e577e82 100644
--- a/src/game/client/components/scoreboard.cpp
+++ b/src/game/client/components/scoreboard.cpp
@@ -284,7 +284,7 @@ void CScoreboard::OnRender()
 		return;
 		
 	// if the score board is active, then we should clear the motd message aswell
-	if(m_Active)
+	if(m_pClient->m_pMotd->IsActive())
 		m_pClient->m_pMotd->Clear();