1 files changed, 11 insertions, 0 deletions
diff --git a/users.c b/users.c
index f868ebdba..454065c2b 100644
--- a/users.c
+++ b/users.c
@@ -712,6 +712,11 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
             user->na->status |= NS_IDENTIFIED;
             check_memos(user);
             nc_changed = 0;
+
+            /* Start nick tracking if available */
+            if (NSNickTracking)
+                nsStartNickTracking(user);
+
         } else if (svid != 1) {
             /* Resets the svid because it doesn't match */
             user->svid = 1;
@@ -789,6 +794,12 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
 
     }                           /* if (!*source) */
 
+    /* Check for nick tracking to bypass identification */
+    if (NSNickTracking && nsCheckNickTracking(user)) {
+        user->na->status |= NS_IDENTIFIED;
+        nc_changed = 0;
+    }
+
     if (nc_changed || !nick_recognized(user)) {
         if (validate_user(user))
             check_memos(user);