3 files changed, 5 insertions, 3 deletions
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 95829a35..64c5214c 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -496,7 +496,7 @@ void fe_channels_nicklist(CHANNEL_REC *channel, int flags)
 	g_slist_free(sorted);
 
 	printformat(channel->server, channel->name,
-		    MSGLEVEL_CLIENTCRAP, TXT_ENDOFNAMES,
+		    MSGLEVEL_CLIENTNOTICE, TXT_ENDOFNAMES,
 		    channel->name, nicks, ops, halfops, voices, normal);
 }
 
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index a11a94bb..b3b4c8d6 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -107,7 +107,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "talking_in", "You are now talking in {channel $0}", 1, { 0 } },
 	{ "not_in_channels", "You are not on any channels", 0 },
 	{ "current_channel", "Current channel {channel $0}", 1, { 0 } },
-	{ "names", "{names_users Users {names_channel $0}} $1", 6, { 0, 1, 1, 1, 1, 1 } },
+	{ "names", "{names_users Users {names_channel $0}}", 6, { 0, 1, 1, 1, 1, 1 } },
 	{ "names_prefix", "{names_prefix $0}", 1, { 0 } },
         { "names_nick_op", "{names_nick_op $0 $1}", 2, { 0, 0 } },
         { "names_nick_halfop", "{names_nick_halfop $0 $1}", 2, { 0, 0 } },
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 80627f88..c3aff141 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -74,7 +74,9 @@ static void event_names_list(IRC_SERVER_REC *server, const char *data)
 	if (irc_channel_find(server, channel) == NULL) {
 		printformat_module("fe-common/core", server, channel,
 				   MSGLEVEL_CRAP, TXT_NAMES,
-				   channel, names);
+				   channel, 0, 0, 0, 0, 0);
+                printtext(server, channel, MSGLEVEL_CRAP, "%s", names);
+
 	}
 	g_free(params);
 }