diff --git a/Client.cpp b/Client.cpp
index d7ceb101..ace69430 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -116,8 +116,7 @@ void CClient::ReadLine(const CString& sData) {
 	}
 
 	if (!m_pUser) {
-		PutClient("ERROR :You need to send your password first!");
-		Close();
+		// Only NICK, USER and PASS are allowed before login
 		return;
 	}