4 files changed, 20 insertions, 0 deletions
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index e302f57f5..8ae557d40 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1692,10 +1692,16 @@ void charybdis_cmd_svid_umode3(User * u, char *ts)
 /* NICK <newnick>  */
 void charybdis_cmd_chg_nick(char *oldnick, char *newnick)
 {
+    Uid *ud;
+
     if (!oldnick || !newnick) {
         return;
     }
 
+    ud = find_uid(oldnick);
+    if (ud)
+        strscpy(ud->nick, newnick, NICKMAX);
+
     send_cmd(oldnick, "NICK %s", newnick);
 }
 
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index e5722c236..5eb9cc5ab 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -1309,6 +1309,8 @@ void inspircd_cmd_chg_nick(char *oldnick, char *newnick)
     if (!ud)
         ud = find_uid(newnick);
 
+    if (ud)
+        strscpy(ud->nick, newnick, NICKMAX);
     send_cmd(ud ? ud->uid : oldnick, "NICK %s %ld", newnick, time(NULL));
 }
 
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 42a00d2f2..231899d3f 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1621,10 +1621,16 @@ void ratbox_cmd_svid_umode3(User * u, char *ts)
 /* NICK <newnick>  */
 void ratbox_cmd_chg_nick(char *oldnick, char *newnick)
 {
+    Uid *ud;
+
     if (!oldnick || !newnick) {
         return;
     }
 
+    ud = find_uid(oldnick);
+    if (ud)
+        strscpy(ud->nick, newnick, NICKMAX);
+
     send_cmd(oldnick, "NICK %s", newnick);
 }
 
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index 2e0262046..a8fd02d4b 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -1567,10 +1567,16 @@ void shadowircd_cmd_svid_umode3(User * u, char *ts)
 /* NICK <newnick>  */
 void shadowircd_cmd_chg_nick(char *oldnick, char *newnick)
 {
+    Uid *ud;
+
     if (!oldnick || !newnick) {
         return;
     }
 
+    ud = find_uid(oldnick);
+    if (ud)
+        strscpy(ud->nick, newnick, NICKMAX);
+
     send_cmd(oldnick, "NICK %s", newnick);
 }