diff --git a/src/irclib.py b/src/irclib.py
index 333b67923..33174b789 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -515,10 +515,10 @@ class IrcState(IrcCommandDispatcher, log.Firewalled):
     def do354(self, irc, msg):
         # WHOX reply.
 
-        if len(msg.args) != 6 or msg.args[1] != '1':
+        if len(msg.args) != 9 or msg.args[1] != '1':
             return
-
-        (__, ___, user, host, nick, ___) = msg.args
+        # irc.nick 1 user ip host nick status account gecos
+        (n, t, user, ip, host, nick, status, account, gecos) = msg.args
         hostmask = '%s!%s@%s' % (nick, user, host)
         self.nicksToHostmasks[nick] = hostmask
 
@@ -1443,7 +1443,7 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
     def doJoin(self, msg):
         if msg.nick == self.nick:
             channel = msg.args[0]
-            self.queueMsg(ircmsgs.who(channel, args=('%tuhna,1',))) # Ends with 315.
+            self.queueMsg(ircmsgs.who(channel, args=('%tuhnairf,1',))) # Ends with 315.
             self.queueMsg(ircmsgs.mode(channel)) # Ends with 329.
             for channel in msg.args[0].split(','):
                 self.queueMsg(ircmsgs.mode(channel, '+b'))