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 14f35864ca0..4145fdd3459 100644
--- a/libs/auth/src/angular/input-password/input-password.component.html
+++ b/libs/auth/src/angular/input-password/input-password.component.html
@@ -31,7 +31,7 @@
   </bit-form-field>
 
   <div class="tw-mb-6">
-    <bit-form-field disableMargin>
+    <bit-form-field [disableMargin]="true">
       <bit-label>{{ "newMasterPass" | i18n }}</bit-label>
       <input
         id="input-password-form_new-password"
diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts
index 2c9eea12461..15a5c00dbc7 100644
--- a/libs/auth/src/angular/input-password/input-password.component.ts
+++ b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -192,7 +192,10 @@ export class InputPasswordComponent implements OnInit {
   }
 
   private addFormFieldsIfNecessary() {
-    if (this.isChangePasswordFlow()) {
+    if (
+      this.flow === InputPasswordFlow.ChangePassword ||
+      this.flow === InputPasswordFlow.ChangePasswordWithOptionalUserKeyRotation
+    ) {
       this.formGroup.addControl(
         "currentPassword",
         this.formBuilder.nonNullable.control("", Validators.required),