diff --git a/src/irclib.py b/src/irclib.py
index 6da2e8942..44e5f2423 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -406,10 +406,10 @@ class IrcState(IrcCommandDispatcher):
         """Handles parsing the 004 reply
 
         Supported user and channel modes are cached"""
-        # msg.args = [server, ircd-version, umodes, modes,
+        # msg.args = [nickname, server, ircd-version, umodes, modes,
         #             modes that require arguments? (non-standard)]
-        self.supported['umodes'] = msg.args[2]
-        self.supported['chanmodes'] = msg.args[3]
+        self.supported['umodes'] = msg.args[3]
+        self.supported['chanmodes'] = msg.args[4]
 
     _005converters = utils.InsensitivePreservingDict({
         'modes': int,
diff --git a/test/test_irclib.py b/test/test_irclib.py
index 2fba31c52..f0f93d8ab 100644
--- a/test/test_irclib.py
+++ b/test/test_irclib.py
@@ -292,7 +292,7 @@ class IrcStateTestCase(SupyTestCase):
 
     def testSupportedUmodes(self):
         state = irclib.IrcState()
-        state.addMsg(self.irc, ircmsgs.IrcMsg(':charm.oftc.net 004 charm.oftc.net hybrid-7.2.2+oftc1.6.8 CDGPRSabcdfgiklnorsuwxyz biklmnopstveI bkloveI'))
+        state.addMsg(self.irc, ircmsgs.IrcMsg(':charm.oftc.net 004 adkwbot charm.oftc.net hybrid-7.2.2+oftc1.6.8 CDGPRSabcdfgiklnorsuwxyz biklmnopstveI bkloveI'))
         self.assertEqual(state.supported['umodes'], 'CDGPRSabcdfgiklnorsuwxyz')
         self.assertEqual(state.supported['chanmodes'],
                          'biklmnopstveI')