diff --git a/IRCLineHandler.py b/IRCLineHandler.py
index 67d9e2a3..a3829b27 100644
--- a/IRCLineHandler.py
+++ b/IRCLineHandler.py
@@ -187,12 +187,14 @@ class LineHandler(object):
                 modes.add(event["server"].mode_prefixes[nickname[0]])
                 nickname = nickname[1:]
 
-            user = event["server"].get_user(nickname)
             if "userhost-in-names" in event["server"].capabilities:
                 nickname, username, hostname = Utils.seperate_hostmask(
                     nickname)
+                user = event["server"].get_user(nickname)
                 user.username = username
                 user.hostname = hostname
+            else:
+                user = event["server"].get_user(nickname)
             user.join_channel(channel)
             channel.add_user(user)