diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
index 8cb40d94524..8c62136d63c 100644
--- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
+++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
@@ -197,8 +197,8 @@ export class UserVerificationFormInputComponent implements ControlValueAccessor,
       }
     }
 
-    // Don't bother executing secret changes if biometrics verification is active.
-    if (this.activeClientVerificationOption === ActiveClientVerificationOption.Biometrics) {
+    // Executing secret changes for all non biometrics verification. Biometrics doesn't have a user entered secret.
+    if (this.activeClientVerificationOption !== ActiveClientVerificationOption.Biometrics) {
       this.processSecretChanges(this.secret.value);
     }
 
diff --git a/libs/common/src/auth/services/user-verification/user-verification.service.ts b/libs/common/src/auth/services/user-verification/user-verification.service.ts
index 7561023a277..85640519ec3 100644
--- a/libs/common/src/auth/services/user-verification/user-verification.service.ts
+++ b/libs/common/src/auth/services/user-verification/user-verification.service.ts
@@ -140,6 +140,10 @@ export class UserVerificationService implements UserVerificationServiceAbstracti
    * @param verification User-supplied verification data (OTP, MP, PIN, or biometrics)
    */
   async verifyUser(verification: Verification): Promise<boolean> {
+    if (verification == null) {
+      throw new Error("Verification is required.");
+    }
+
     const [userId, email] = await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => [a?.id, a?.email])),
     );