diff --git a/irc/constants.go b/irc/constants.go
index c91111ba..cf7cb0a9 100644
--- a/irc/constants.go
+++ b/irc/constants.go
@@ -23,7 +23,7 @@ var (
 )
 
 const (
-	SEM_VER       = "ergonomadic-1.2.0"
+	SEM_VER       = "ergonomadic-1.2.1"
 	CRLF          = "\r\n"
 	MAX_REPLY_LEN = 512 - len(CRLF)
 
diff --git a/irc/server.go b/irc/server.go
index 135c20d2..f10b2e89 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -407,6 +407,10 @@ func (msg *NickCommand) HandleServer(server *Server) {
 		return
 	}
 
+	if msg.nickname == client.nick {
+		return
+	}
+
 	if server.clients.Get(msg.nickname) != client {
 		client.ErrNickNameInUse(msg.nickname)
 		return