diff --git a/handlers.lua b/handlers.lua
index 6b892f9..d46ee64 100644
--- a/handlers.lua
+++ b/handlers.lua
@@ -74,6 +74,9 @@ handlers["NICK"] = function(o, prefix, newnick)
 	else
 		o:invoke("NickChange", user, newnick)
 	end
+	if user.nick == o.nick then
+		o.nick = newnick
+	end
 end
 
 --NAMES list