diff --git a/libs/angular/src/auth/components/sso.component.ts b/libs/angular/src/auth/components/sso.component.ts
index 92135129c413..b18920492c0a 100644
--- a/libs/angular/src/auth/components/sso.component.ts
+++ b/libs/angular/src/auth/components/sso.component.ts
@@ -217,7 +217,7 @@ export class SsoComponent {
         !acctDecryptionOpts.hasMasterPassword &&
         acctDecryptionOpts.keyConnectorOption === undefined;
 
-      if (requireSetPassword) {
+      if (requireSetPassword || authResult.resetMasterPassword) {
         // Change implies going no password -> password in this case
         return await this.handleChangePasswordRequired(orgIdentifier);
       }
diff --git a/libs/angular/src/auth/components/two-factor.component.ts b/libs/angular/src/auth/components/two-factor.component.ts
index 35fc7240f287..ab857c9de1d4 100644
--- a/libs/angular/src/auth/components/two-factor.component.ts
+++ b/libs/angular/src/auth/components/two-factor.component.ts
@@ -242,7 +242,7 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
     const requireSetPassword =
       !acctDecryptionOpts.hasMasterPassword && acctDecryptionOpts.keyConnectorOption === undefined;
 
-    if (requireSetPassword) {
+    if (requireSetPassword || authResult.resetMasterPassword) {
       // Change implies going no password -> password in this case
       return await this.handleChangePasswordRequired(this.orgIdentifier);
     }
diff --git a/libs/common/src/auth/models/domain/auth-result.ts b/libs/common/src/auth/models/domain/auth-result.ts
index 460ef2b8a016..c0a6f034aefd 100644
--- a/libs/common/src/auth/models/domain/auth-result.ts
+++ b/libs/common/src/auth/models/domain/auth-result.ts
@@ -5,6 +5,7 @@ import { ForceResetPasswordReason } from "./force-reset-password-reason";
 
 export class AuthResult {
   captchaSiteKey = "";
+  // TODO: PM-3287 - Remove this after 3 releases of backwards compatibility. - Target release 2023.12 for removal
   /**
    * @deprecated
    * Replace with using AccountDecryptionOptions to determine if the user does