diff --git a/Changes b/Changes
index 95198be83..d6cc7562b 100644
--- a/Changes
+++ b/Changes
@@ -346,3 +346,4 @@
 - Fixed a bug that prolly was fixed by Potvin, but was "not fixed correctly"
 - Fixed a crash problem in register_user and most likely fixed the "strange
   vhost" thing, (was a dumb bug, mising ircsprintf)
+- Fixed the *** NickServ sets mode +creep SVS2MODE bug..
\ No newline at end of file
diff --git a/src/s_user.c b/src/s_user.c
index a137afeb7..0a5a8a6d8 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -4564,8 +4564,9 @@ setmodey:
 		sendto_serv_butone_token(cptr, parv[0], MSG_SVS2MODE,
 		    TOK_SVS2MODE, "%s %s", parv[1], parv[2]);
 
-	sendto_one(acptr, ":%s MODE %s :%s", parv[0], parv[1], parv[2]);
-
+	send_umode(NULL, sptr, setflags, ALL_UMODES, buf);
+	if (MyClient(sptr))
+		sendto_one(sptr, ":%s MODE %s :%s", parv[0], parv[1], buf);
 	return 0;
 }