diff --git a/BOB.cpp b/BOB.cpp
index ae6e12ce..aa11c7b8 100644
--- a/BOB.cpp
+++ b/BOB.cpp
@@ -409,10 +409,13 @@ namespace client
 		{
 			m_Keys = m_CurrentDestination->GetKeys ();
 			m_Nickname = operand;
+		}
+		if (m_Nickname == operand)
+		{	
 			std::string msg ("Nickname set to ");
 			msg += m_Nickname;
 			SendReplyOK (msg.c_str ());
-		}
+		}	
 		else
 			SendReplyError ("no nickname has been set");	
 	}