diff --git a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html
index 511220c8db1..3dd33c94604 100644
--- a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html
+++ b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.html
@@ -5,9 +5,7 @@
 <bit-callout type="warning">{{ "loggedOutWarning" | i18n }}</bit-callout>
 
 <div class="tw-max-w-md tw-mb-12">
-  <auth-change-password
-    [inputPasswordFlow]="InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation"
-  ></auth-change-password>
+  <auth-change-password [inputPasswordFlow]="inputPasswordFlow"></auth-change-password>
 </div>
 
 <app-webauthn-login-settings></app-webauthn-login-settings>
diff --git a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
index 25fc8f1c6b5..ee30543fba2 100644
--- a/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
+++ b/apps/web/src/app/auth/settings/security/password-settings/password-settings.component.ts
@@ -16,7 +16,7 @@ import { WebauthnLoginSettingsModule } from "../../webauthn-login-settings";
   imports: [CalloutModule, ChangePasswordComponent, I18nPipe, WebauthnLoginSettingsModule],
 })
 export class PasswordSettingsComponent implements OnInit {
-  InputPasswordFlow = InputPasswordFlow;
+  inputPasswordFlow = InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation;
 
   constructor(
     private router: Router,
diff --git a/libs/auth/src/angular/input-password/input-password.component.html b/libs/auth/src/angular/input-password/input-password.component.html
index 9daf0920a5e..25022ed19ab 100644
--- a/libs/auth/src/angular/input-password/input-password.component.html
+++ b/libs/auth/src/angular/input-password/input-password.component.html
@@ -58,7 +58,7 @@
   </div>
 
   <bit-form-field>
-    <bit-label>{{ "confirmMasterPassword" | i18n }}</bit-label>
+    <bit-label>{{ "confirmNewMasterPass" | i18n }}</bit-label>
     <input
       id="input-password-form_confirm-new-password"
       bitInput