diff --git a/server/models/user.ts b/server/models/user.ts
index f3a92d93ea..42669547ee 100644
--- a/server/models/user.ts
+++ b/server/models/user.ts
@@ -286,12 +286,8 @@ userSchema.statics.findByEmailOrUsername = async function findByEmailOrUsername(
     ? options.valueType === 'email'
     : value.indexOf('@') > -1;
 
-  // do the case insensitive stuff
-  if (
-    arguments.length === 2 &&
-    typeof options === 'object' &&
-    options.caseInsensitive
-  ) {
+  // do the case insensitive stuff when explicitly requested via options
+  if (options && typeof options === 'object' && options.caseInsensitive) {
     const query = isEmail ? { email: value } : { username: value };
     const foundUser = await user
       .findOne(query)