Only bad-password users when the account theyre trying to identify for actually exists

1 files changed, 7 insertions, 2 deletions

diff --git a/modules/commands/ns_identify.cpp b/modules/commands/ns_identify.cpp
index 4796e7bb6..f1e0a7d3d 100644
--- a/modules/commands/ns_identify.cpp
+++ b/modules/commands/ns_identify.cpp
@@ -48,8 +48,13 @@ class NSIdentifyRequest : public IdentifyRequest
 		if (source.GetUser())
 		{
 			Log(LOG_COMMAND, source, cmd) << "and failed to identify";
-			source.Reply(PASSWORD_INCORRECT);
-			source.GetUser()->BadPassword();
+			if (NickAlias::Find(GetAccount()) != NULL)
+			{
+				source.Reply(PASSWORD_INCORRECT);
+				source.GetUser()->BadPassword();
+			}
+			else
+				source.Reply(NICK_X_NOT_REGISTERED, GetAccount().c_str());
 		}
 	}
 };