diff --git a/src/components/ha-password-field.ts b/src/components/ha-password-field.ts
index d97c23c4de..6dc794992d 100644
--- a/src/components/ha-password-field.ts
+++ b/src/components/ha-password-field.ts
@@ -118,6 +118,7 @@ export class HaPasswordField extends LitElement {
         .type=${this._unmaskedPassword ? "text" : "password"}
         .suffix=${html`<div style="width: 24px"></div>`}
         @input=${this._handleInputChange}
+        @change=${this._reDispatchEvent}
       ></ha-textfield>
       <ha-icon-button
         toggles
@@ -156,6 +157,12 @@ export class HaPasswordField extends LitElement {
     this.value = ev.target.value;
   }
 
+  @eventOptions({ passive: true })
+  private _reDispatchEvent(oldEvent: Event) {
+    const newEvent = new Event(oldEvent.type, oldEvent);
+    this.dispatchEvent(newEvent);
+  }
+
   static styles = css`
     :host {
       display: block;