diff --git a/ircd/s_auth.c b/ircd/s_auth.c
index c30b9e140..eb4578f22 100644
--- a/ircd/s_auth.c
+++ b/ircd/s_auth.c
@@ -545,7 +545,7 @@ read_auth_reply(rb_fde_t *F, void *data)
 
 			for (count = USERLEN; *s && count; s++)
 			{
-				if(*s == '@')
+				if(*s == '@' || *s == '\r' || *s == '\n')
 				{
 					break;
 				}