diff --git a/IRCSock.cpp b/IRCSock.cpp
index 610089cb..c560738f 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -88,6 +88,7 @@ void CIRCSock::ReadLine(const CString& sData) {
 					SetTimeout(900);	// Now that we are connected, let nature take its course
 					PutIRC("WHO " + sNick);
 
+					SetNick(sNick);
 					m_pUser->StartAwayNickTimer();
 
 					MODULECALL(OnIRCConnected(), m_pUser, NULL, );
@@ -107,8 +108,6 @@ void CIRCSock::ReadLine(const CString& sData) {
 						}
 					}
 
-					SetNick(sNick);
-
 					m_pUser->ClearRawBuffer();
 					m_pUser->AddRawBuffer(":" + sServer + " " + sCmd + " ", " " + sRest);