diff --git a/src/component/form/form.js b/src/component/form/form.js
index 748b6a65f..27734455f 100644
--- a/src/component/form/form.js
+++ b/src/component/form/form.js
@@ -51,12 +51,7 @@
                 listeners: [{
                     eventName: "EVENT_CHANGE",
                     action: function () {
-                        this.validate();
-                        if (self.isAllValid()) {
-                            self.fireEvent("EVENT_VALID");
-                        } else {
-                            self.fireEvent("EVENT_ERROR");
-                        }
+                        self.fireEvent(BI.Form.EVENT_CHANGE, this.validate());
                     }
                 }]
             };
@@ -94,6 +89,5 @@
     }
 });
 
-BI.Form.EVENT_VALID = "EVENT_VALID";
-BI.Form.EVENT_ERROR = "EVENT_ERROR";
+BI.Form.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.custom_form", BI.Form);
diff --git a/typescript/component/form/form.ts b/typescript/component/form/form.ts
index c802c6362..ab5844120 100644
--- a/typescript/component/form/form.ts
+++ b/typescript/component/form/form.ts
@@ -2,8 +2,7 @@ import { Widget } from "../../core/widget";
 
 export declare class Form extends Widget {
     static xtype: string;
-    static EVENT_VALID: string;
-    static EVENT_ERROR: string;
+    static EVENT_CHANGE: string;
 
     isAllValid(): boolean;