diff --git a/src/irc.c b/src/irc.c
--- a/src/irc.c
+++ b/src/irc.c
@@ -137,7 +137,7 @@
             return IRC_GENERAL_ERROR;
         }
 
-        if (strstr (msg, "is not registered") != NULL) {
+        if (strstr (msg, "is not a registered") != NULL) {
             return IRC_LOGIN_ERROR;
         }
         if (strstr (msg, ":Nickname is already in use") != NULL) {
@@ -325,6 +325,7 @@
             case 376:          /* END OF MOTD */
                 return command;
             case 401:          /* NO SUCH NICK/CHANNEL */
+            case 402:          /* NO SUCH USER */
             case 403:          /* THAT CHANNEL DOESN'T EXIST */
             case 412:          /* NO TEXT TO SEND */
             case 441:          /* THEY AREN'T ON THIS CHANNEL */