diff --git a/modules/filter.c b/modules/filter.c
index 32b712c7..0efba448 100644
--- a/modules/filter.c
+++ b/modules/filter.c
@@ -306,8 +306,9 @@ filter_msg_user(void *data_)
 	char *text = rb_strdup(data->text);
 	strip_colour(text);
 	strip_unprintable(text);
-	snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s %s %s :%s",
+	snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s %s :%s",
 	         s->name, s->username, s->host,
+	         s->user && s->user->suser[0] != '\0' ? '1' : '0',
 	         cmdname[data->msgtype],
 	         data->target_p->name,
 	         text);
@@ -343,8 +344,9 @@ filter_msg_channel(void *data_)
 	char *text = rb_strdup(data->text);
 	strip_colour(text);
 	strip_unprintable(text);
-	snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s %s %s :%s",
+	snprintf(check_buffer, sizeof check_buffer, ":%s!%s@%s#%c %s %s :%s",
 	         s->name, s->username, s->host,
+	         s->user && s->user->suser[0] != '\0' ? '1' : '0',
 	         cmdname[data->msgtype],
 	         data->chptr->chname,
 	         text);