diff --git a/server/configuration/accounts_meld.js b/server/configuration/accounts_meld.js
index 139b1be0262..cb3327388b1 100644
--- a/server/configuration/accounts_meld.js
+++ b/server/configuration/accounts_meld.js
@@ -39,7 +39,7 @@ Accounts.updateOrCreateUserFromExternalService = function(serviceName, serviceDa
 				verified: true,
 			};
 
-			if (!_.findWhere(user.emails, findQuery)) {
+			if (user.services?.password && !_.findWhere(user.emails, findQuery)) {
 				Users.resetPasswordAndSetRequirePasswordChange(user._id, true, 'This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password');
 			}
 
diff --git a/server/lib/compareUserPassword.js b/server/lib/compareUserPassword.js
index 34c2fb4c699..ab50aed6be8 100644
--- a/server/lib/compareUserPassword.js
+++ b/server/lib/compareUserPassword.js
@@ -7,7 +7,7 @@ import { Accounts } from 'meteor/accounts-base';
  */
 export function compareUserPassword(user, pass) {
 	if (!user?.services?.password?.bcrypt?.trim()) {
-		return true;
+		return false;
 	}
 
 	if (!pass || (!pass.plain && !pass.sha256)) {