diff --git a/src/jrd/pwd.cpp b/src/jrd/pwd.cpp
index 55d834aa3d..1374454ca5 100644
--- a/src/jrd/pwd.cpp
+++ b/src/jrd/pwd.cpp
@@ -453,6 +453,11 @@ void SecurityDatabase::verifyUser(TEXT* name,
 	}
 
 #ifndef EMBEDDED
+	else
+	{
+		remoteFailedLogins().loginFail(remoteId);
+		ERR_post(isc_login, 0);
+	}
 
 	// Look up the user name in the userinfo database and use the parameters
 	// found there. This means that another database must be accessed, and
diff --git a/src/jrd/scl.epp b/src/jrd/scl.epp
index 922b283a43..04cc66bb80 100644
--- a/src/jrd/scl.epp
+++ b/src/jrd/scl.epp
@@ -604,11 +604,6 @@ void SCL_init(bool create,
 
 	if (user_name || (id == -1))
 	{
-		if (!user_name || (!password_enc && !password))
-		{
-			ERR_post(isc_login, 0);
-		}
-
 		if (!JRD_get_thread_security_disabled())
 		{
 			Attachment* att = tdbb->tdbb_attachment;