diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 6c360591..e06b3acf 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -747,17 +747,6 @@ static void event_unknown_mode(IRC_SERVER_REC *server, const char *data)
 	g_free(params);
 }
 
-static void event_not_chanop(IRC_SERVER_REC *server, const char *data)
-{
-	char *params, *channel;
-
-	g_return_if_fail(data != NULL);
-
-	params = event_get_params(data, 2, NULL, &channel);
-	printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_NOT_CHANOP, channel);
-	g_free(params);
-}
-
 static void event_numeric(IRC_SERVER_REC *server, const char *data,
 			  const char *nick)
 {
@@ -898,7 +887,6 @@ void fe_events_numeric_init(void)
 	signal_add("event 474", (SIGNAL_FUNC) event_banned);
 	signal_add("event 475", (SIGNAL_FUNC) event_bad_channel_key);
 	signal_add("event 476", (SIGNAL_FUNC) event_bad_channel_mask);
-	signal_add("event 482", (SIGNAL_FUNC) event_not_chanop);
 	signal_add("event 375", (SIGNAL_FUNC) event_motd);
 	signal_add("event 376", (SIGNAL_FUNC) event_motd);
 	signal_add("event 372", (SIGNAL_FUNC) event_motd);
@@ -916,6 +904,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 436", (SIGNAL_FUNC) event_received);
 	signal_add("event 438", (SIGNAL_FUNC) event_received);
 	signal_add("event 465", (SIGNAL_FUNC) event_received);
+	signal_add("event 482", (SIGNAL_FUNC) event_received);
 
 	signal_add("event 368", (SIGNAL_FUNC) event_target_received);
 	signal_add("event 347", (SIGNAL_FUNC) event_target_received);
@@ -981,7 +970,6 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 474", (SIGNAL_FUNC) event_banned);
 	signal_remove("event 475", (SIGNAL_FUNC) event_bad_channel_key);
 	signal_remove("event 476", (SIGNAL_FUNC) event_bad_channel_mask);
-	signal_remove("event 482", (SIGNAL_FUNC) event_not_chanop);
 	signal_remove("event 375", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 376", (SIGNAL_FUNC) event_motd);
 	signal_remove("event 372", (SIGNAL_FUNC) event_motd);
@@ -999,6 +987,7 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 436", (SIGNAL_FUNC) event_received);
 	signal_remove("event 438", (SIGNAL_FUNC) event_received);
 	signal_remove("event 465", (SIGNAL_FUNC) event_received);
+	signal_remove("event 482", (SIGNAL_FUNC) event_received);
 
 	signal_remove("event 368", (SIGNAL_FUNC) event_target_received);
 	signal_remove("event 347", (SIGNAL_FUNC) event_target_received);
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 7f5384f3..eb97acea 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -110,7 +110,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "end_of_whois", "End of WHOIS", 1, { 0 } },
 	{ "end_of_whowas", "End of WHOWAS", 1, { 0 } },
 	{ "whois_not_found", "There is no such nick $0", 1, { 0 } },
-        { "who", "{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 {comment {hilight $6}}", 8, { 0, 0, 0, 0, 0, 0, 0, 0 } },
+        { "who", "%#{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 {comment {hilight $6}}", 8, { 0, 0, 0, 0, 0, 0, 0, 0 } },
 	{ "end_of_who", "End of /WHO list", 1, { 0 } },
 
 	/* ---- */
@@ -152,7 +152,6 @@ FORMAT_REC fecommon_irc_formats[] = {
         { "kill_server", "You were {error killed} by {server $0} {reason $1} {comment Path: $2}", 3, { 0, 0, 0 } },
 	{ "error", "{error ERROR} $0", 1, { 0 } },
 	{ "unknown_mode", "Unknown mode character $0", 1, { 0 } },
-	{ "not_chanop", "You're not channel operator in {channel $0}", 1, { 0 } },
 	{ "default_event", "[$0] $1", 2, { 0, 0 } },
 
 	/* ---- */
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 90179a1b..5166f31c 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -123,7 +123,6 @@ enum {
 	IRCTXT_KILL_SERVER,
 	IRCTXT_ERROR,
 	IRCTXT_UNKNOWN_MODE,
-	IRCTXT_NOT_CHANOP,
 	IRCTXT_DEFAULT_EVENT,
 
 	IRCTXT_FILL_11,