diff --git a/tsstats/client.py b/tsstats/client.py
index 09f7102..a00e1c3 100644
--- a/tsstats/client.py
+++ b/tsstats/client.py
@@ -32,7 +32,8 @@ class Clients(MutableMapping):
         for event in events:
             # find corresponding client
             client = self.setdefault(
-                event.identifier, Client(event.identifier)
+                event.identifier,
+                Client(self.ident_map.get(event.identifier, event.identifier))
             )
             if event.action == 'set_nick':
                 client.nick = event.arg