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

1 files changed, 10 insertions, 5 deletions

diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index 419857eee..ed258c4e4 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -106,13 +106,18 @@ class NSRecoverRequest : public IdentifyRequest
 
 	void OnFail() anope_override
 	{
-		source.Reply(ACCESS_DENIED);
-		if (!GetPassword().empty())
+		if (NickAlias::Find(GetAccount()) != NULL)
 		{
-			Log(LOG_COMMAND, source, cmd) << "with an invalid password for " << GetAccount();
-			if (source.GetUser())
-				source.GetUser()->BadPassword();
+			source.Reply(ACCESS_DENIED);
+			if (!GetPassword().empty())
+			{
+				Log(LOG_COMMAND, source, cmd) << "with an invalid password for " << GetAccount();
+				if (source.GetUser())
+					source.GetUser()->BadPassword();
+			}
 		}
+		else
+			source.Reply(NICK_X_NOT_REGISTERED, GetAccount().c_str());
 	}
 };