--- src/modules/m_cap.c.old
+++ src/modules/m_cap.c
@@ -280,7 +280,7 @@ static int cap_end(aClient *sptr, const char *arg)
 
 	sptr->proto &= ~PROTO_CLICAP;
 
-	if (sptr->name[0] && sptr->user != NULL)
+	if (*sptr->name && sptr->user && *sptr->user->username && IsNotSpoof(sptr))
 		return register_user(sptr, sptr, sptr->name, sptr->user->username, NULL, NULL, NULL);
         
         return 0;