diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 651125e0..165478cf 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -1086,7 +1086,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[])
 
 		case WORDL('N','O','T','I'):
 			{
-				int id = FALSE;							/* identified */
+				int id = FALSE;								/* identified */
 				char *response;
 
 				text = word_eol[4];
@@ -1095,7 +1095,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[])
 					text++;
 				}
 
-				if (!strncmp (text, "CHALLENGE ", 10))		/* QuakeNet CHALLENGEAUTH upon our request */
+				if (!strncmp (text, "CHALLENGE ", 10))		/* QuakeNet CHALLENGE upon our request */
 				{
 					response = challengeauth_response (((ircnet *)serv->network)->user ? ((ircnet *)serv->network)->user : prefs.hex_irc_user_name, serv->password, word[5]);
 
@@ -1106,6 +1106,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[])
 						CHALLENGEAUTH_ALGO);
 
 					g_free (response);
+					return;									/* omit the CHALLENGE <hash> ALGOS message */
 				}
 
 				if (serv->have_idmsg)