diff --git a/src/irc.c b/src/irc.c
--- a/src/irc.c
+++ b/src/irc.c
@@ -103,6 +103,10 @@
             break;
         }
 
+        if (strstr (msg, ":You are now logged in.") != NULL) {
+            break;
+        }
+
         if (strstr (msg, ":Password Incorrect") != NULL) {
             return IRC_LOGIN_ERROR;
         }
@@ -309,6 +313,11 @@
                 message->line = strtok (NULL, "\r\n");
                 return command;
                 break;
+			case 901: /* notify or some crap */
+				message->channel = strtok (message->line, " ");
+				message->line = strtok(NULL, "\r\n");
+				return command;
+				break;
             default:
                 printf ("DEBUG   %s", line);
                 printf ("Unknown Value: %d\n", value);