diff --git a/IRCLineHandler.py b/IRCLineHandler.py
index a3829b27..9781581d 100644
--- a/IRCLineHandler.py
+++ b/IRCLineHandler.py
@@ -225,6 +225,12 @@ class LineHandler(object):
             if not event["server"].has_user(nickname):
                 user.username = username
                 user.hostname = hostname
+
+            if account:
+                user.identified_account = account
+            if realname:
+                user.realname = realname
+
             channel.add_user(user)
             user.join_channel(channel)
             self.events.on("received").on("join").call(channel=channel,
@@ -465,9 +471,11 @@ class LineHandler(object):
         user = event["server"].get_user("nickname")
 
         if not event["args"][0] == "*":
+            user.identified_account = event["tags"]["account"]
             self.events.on("received.account.login").call(user=user,
                 server=event["server"], account=event["tags"]["account"])
         else:
+            user.identified_account = None
             self.events.on("received.account.logout").call(user=user,
                 server=event["server"])
 
diff --git a/IRCUser.py b/IRCUser.py
index ea54bf6b..4229ad12 100644
--- a/IRCUser.py
+++ b/IRCUser.py
@@ -11,6 +11,7 @@ class User(object):
         self.server = server
         self.bot = bot
         self.channels = set([])
+        self.identified_account = None
         self.buffer = IRCBuffer.Buffer(bot)
 
     def __repr__(self):