1 files changed, 6 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);
 }