diff --git a/modules/m_cap.c b/modules/m_cap.c
index 9fa94d3..94aebac 100644
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -319,7 +319,7 @@ cap_end(struct Client *source_p, const char *arg)
 
 	source_p->flags &= ~FLAGS_CLICAP;
 
-	if(source_p->name[0] && source_p->user)
+	if(source_p->name[0] && source_p->flags & FLAGS_SENTUSER)
 	{
 		char buf[USERLEN+1];
 		rb_strlcpy(buf, source_p->username, sizeof(buf));