diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index 41c87a8d4..2ca493782 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -21,7 +21,7 @@
     </md-toolbar>
     <md-dialog-content class="md-dialog-content">
 
-      <form id="mainForm" name="accountForm" var:href="ownPath">
+      <form id="accountForm" name="accountForm" var:href="ownPath">
 
         <div layout="row">
           <md-input-container class="md-block md-flex">
@@ -147,7 +147,7 @@
     </md-dialog-content>
     <md-dialog-actions>
       <md-button type="button" ng-click="$AccountDialogController.cancel()"><var:string label:value="Cancel"/></md-button>
-      <md-button ng-disabled="$AccountDialogController.accountForm.$invalid"
+      <md-button ng-disabled="accountForm.$invalid"
                  ng-click="$AccountDialogController.save()"
                  ng-bind="::'OK' | loc"><!-- OK --></md-button>
     </md-dialog-actions>
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index ce57bd8ce..777d821ba 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -8,7 +8,7 @@
     xmlns:rsrc="OGo:url"
     xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
 <md-dialog flex="50" flex-sm="80" flex-xs="100">
-  <form name="mainForm" ng-submit="filterEditor.save(mainForm)">
+  <form id="filterForm" name="filterForm" ng-submit="filterEditor.save(filterForm)">
     <md-toolbar>
       <div class="md-toolbar-tools">
         <md-icon class="material-icons sg-icon-toolbar-bg">filter_list</md-icon>
@@ -176,7 +176,9 @@
     </md-dialog-content>
     <md-dialog-actions>
       <md-button type="button" ng-click="filterEditor.cancel()"><var:string label:value="Cancel"/></md-button>
-      <md-button type="submit" ng-bind="::'OK' | loc"><!-- OK --></md-button>
+      <md-button type="submit"
+                 ng-disabled="filterForm.$invalid"
+                 ng-bind="::'OK' | loc"><!-- OK --></md-button>
     </md-dialog-actions>
   </form>
 </md-dialog>