diff --git a/tools/irc.py b/tools/irc.py
index a0e30a6..865fae9 100644
--- a/tools/irc.py
+++ b/tools/irc.py
@@ -255,6 +255,12 @@ class Client:
                 for func in self.__function_register[ServerMessage.RAW]:
                     func(msg_from, msg_type, msg_to, message)
 
+            if "!" in msg_from and msg_from not in self.__userlist:
+                self.__userlist[msg_from] = User(msg_from)
+                if self.__userlist[msg_from].nickname == self.__userlist[self.__my_user].nickname:
+                    del self.__userlist[self.__my_user]
+                    self.__my_user = msg_from
+
             if msg_type in self.__function_register:
                 for func in self.__function_register[msg_type]:
                     func(msg_from, msg_to, message)