diff --git a/Changes b/Changes
index 8aa984a5a..0727e8248 100644
--- a/Changes
+++ b/Changes
@@ -742,3 +742,5 @@
 - Fixed a bug with /invite with no parameters (accidentily broken when +I was added)
   (#0002383) reported by trystanscott.
 - Fixed a bug where /SAJOIN user 0 caused a desynch, reported by trystanscott (#0002384).
+- Merged NICKCHARS= in PROTOCTL for now, since a seperate one is not (yet!) needed,
+  reported by SolutechUK and psadi (#0002386).
diff --git a/src/s_serv.c b/src/s_serv.c
index f4bc564a4..f429c8f2a 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -187,12 +187,10 @@ char *num = NULL;
  */
 void send_proto(aClient *cptr, ConfigItem_link *aconf)
 {
-char buf[512];
+char buf[1024];
 
-	sendto_one(cptr, "PROTOCTL NICKCHARS=%s", langsinuse);
-
-	sprintf(buf, "CHANMODES=%s%s,%s%s,%s%s,%s%s",
-		CHPAR1, EXPAR1, CHPAR2, EXPAR2, CHPAR3, EXPAR3, CHPAR4, EXPAR4);
+	sprintf(buf, "CHANMODES=%s%s,%s%s,%s%s,%s%s NICKCHARS=%s",
+		CHPAR1, EXPAR1, CHPAR2, EXPAR2, CHPAR3, EXPAR3, CHPAR4, EXPAR4, langsinuse);
 #ifdef ZIP_LINKS
 	if (aconf->options & CONNECT_ZIP)
 	{