1 files changed, 3 insertions, 0 deletions
diff --git a/src/users.c b/src/users.c
index c8abab7c3..5d1583b25 100644
--- a/src/users.c
+++ b/src/users.c
@@ -656,6 +656,9 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
         /* An old user changing nicks. */
         if (UseTS6)
             user = find_byuid(source);
+            if (!user) {
+                user = finduser(source);
+            }
         else
             user = finduser(source);