diff --git a/client/modules/User/components/AccountForm.tsx b/client/modules/User/components/AccountForm.tsx
index b587c73052..71d996bee9 100644
--- a/client/modules/User/components/AccountForm.tsx
+++ b/client/modules/User/components/AccountForm.tsx
@@ -144,7 +144,7 @@ export function AccountForm() {
             <Field name="currentPassword">
               {(field) => (
                 <p className="form__field">
-                  <label htmlFor="current password" className="form__label">
+                  <label htmlFor="currentPassword" className="form__label">
                     {t('AccountForm.CurrentPassword')}
                   </label>
                   <input
@@ -166,7 +166,7 @@ export function AccountForm() {
             <Field name="newPassword">
               {(field) => (
                 <p className="form__field">
-                  <label htmlFor="new password" className="form__label">
+                  <label htmlFor="newPassword" className="form__label">
                     {t('AccountForm.NewPassword')}
                   </label>
                   <input
diff --git a/server/models/user.ts b/server/models/user.ts
index f3a92d93ea..426945eca0 100644
--- a/server/models/user.ts
+++ b/server/models/user.ts
@@ -287,11 +287,7 @@ userSchema.statics.findByEmailOrUsername = async function findByEmailOrUsername(
     : value.indexOf('@') > -1;
 
   // do the case insensitive stuff
-  if (
-    arguments.length === 2 &&
-    typeof options === 'object' &&
-    options.caseInsensitive
-  ) {
+  if (options?.caseInsensitive) {
     const query = isEmail ? { email: value } : { username: value };
     const foundUser = await user
       .findOne(query)