2 files changed, 4 insertions, 2 deletions
diff --git a/src/conf.c b/src/conf.c
index 6f2a05e..6e65aeb 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -347,7 +347,7 @@ verify_access(struct Client *client_p)
                                "%s spoofing: %s as %s",
                                client_p->name, client_p->host, conf->name);
         strlcpy(client_p->host, conf->name, sizeof(client_p->host));
-        SetIPSpoof(client_p);
+        AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
       }
 
       return(attach_iline(client_p, conf));
diff --git a/src/s_user.c b/src/s_user.c
index 709e0d9..8190ca2 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -1071,7 +1071,9 @@ user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
       break;
     case MODE_DEL:
       DelUMode(target_p, UMODE_HIDDENHOST);
-      DelFlag(target_p, FLAGS_IP_SPOOFING);
+
+      if (!HasFlag(target_p, FLAGS_AUTH_SPOOF));
+        DelFlag(target_p, FLAGS_IP_SPOOFING);
       break;
     default: break;
   }