diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
index 7bdbc5361eb..a54bf915a90 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
@@ -16,7 +16,7 @@
       [submitBtn]="submitBtn"
       (formReady)="onFormReady()"
       (cipherSaved)="onCipherSaved($event)"
-      (onFormStatusChange)="formStatusChanged($event)"
+      (formStatusChange$)="formStatusChanged($event)"
     >
       <bit-item slot="attachment-button">
         <button
diff --git a/libs/vault/src/cipher-form/components/cipher-form.component.ts b/libs/vault/src/cipher-form/components/cipher-form.component.ts
index 82f99e35a54..be3092861f7 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.ts
@@ -112,13 +112,11 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
 
   @Output() formReady = this.formReadySubject.asObservable();
 
-  @Output() onFormStatusChange = new EventEmitter<"enabled" | "disabled">();
-
   /**
    * Emitted when the form is enabled
    */
   private formStatusChangeSubject = new Subject<"enabled" | "disabled">();
-  formStatusChange$ = this.formStatusChangeSubject.asObservable();
+  @Output() formStatusChange$ = this.formStatusChangeSubject.asObservable();
 
   /**
    * The original cipher being edited or cloned. Null for add mode.
@@ -161,13 +159,11 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
   disableFormFields(): void {
     this.cipherForm.disable({ emitEvent: false });
     this.formStatusChangeSubject.next("disabled");
-    this.onFormStatusChange.emit("disabled");
   }
 
   enableFormFields(): void {
     this.cipherForm.enable({ emitEvent: false });
     this.formStatusChangeSubject.next("enabled");
-    this.onFormStatusChange.emit("enabled");
   }
 
   /**