From 2c7da3bb0f1a99a48085163d0ad71f990ff6ef87 Mon Sep 17 00:00:00 2001
From: Patrick Pimentel <ppimentel@bitwarden.com>
Date: Wed, 4 Jun 2025 14:55:49 -0400
Subject: [PATCH] feat(change-password-component): Change Password Update
 [18720] - Should be working fully

---
 .../src/common/login-strategies/password-login.strategy.ts   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/auth/src/common/login-strategies/password-login.strategy.ts b/libs/auth/src/common/login-strategies/password-login.strategy.ts
index c50105debbf..882d2775b7c 100644
--- a/libs/auth/src/common/login-strategies/password-login.strategy.ts
+++ b/libs/auth/src/common/login-strategies/password-login.strategy.ts
@@ -183,7 +183,10 @@ export class PasswordLoginStrategy extends LoginStrategy {
     if (
       await this.configService.getFeatureFlag(FeatureFlag.PM16117_ChangeExistingPasswordRefactor)
     ) {
-      masterPasswordPolicyOptions = credentials.masterPasswordPolicies;
+      // Take credentials from a potential org invite first, then take from
+      masterPasswordPolicyOptions = credentials.masterPasswordPolicies
+        ? credentials.masterPasswordPolicies
+        : this.getMasterPasswordPolicyOptionsFromResponse(identityResponse);
 
       if (!masterPasswordPolicyOptions?.enforceOnLogin) {
         return;