diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 6b388bfa340..c9515a3b03e 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -523,7 +523,7 @@ export class Users extends Base {
 	}
 
 	findOneByEmailAddress(emailAddress, options) {
-		const query = { 'emails.address': new RegExp(`^${ s.escapeRegExp(emailAddress) }$`, 'i') };
+		const query = { 'emails.address': String(emailAddress).trim().toLowerCase() };
 
 		return this.findOne(query, options);
 	}
diff --git a/server/methods/registerUser.js b/server/methods/registerUser.js
index 9ef019fab96..1dfac976dfc 100644
--- a/server/methods/registerUser.js
+++ b/server/methods/registerUser.js
@@ -62,7 +62,7 @@ Meteor.methods({
 		};
 
 		// Check if user has already been imported and never logged in. If so, set password and let it through
-		const importedUser = Users.findOneByEmailAddress(s.trim(formData.email.toLowerCase()));
+		const importedUser = Users.findOneByEmailAddress(formData.email);
 		let userId;
 		if (importedUser && importedUser.importIds && importedUser.importIds.length && !importedUser.lastLogin) {
 			Accounts.setPassword(importedUser._id, userData.password);