diff --git a/modules/client/front/basic-data/index.html b/modules/client/front/basic-data/index.html
index 07b24db89..e47798bbb 100644
--- a/modules/client/front/basic-data/index.html
+++ b/modules/client/front/basic-data/index.html
@@ -71,7 +71,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            label="Undo changes"
+            ng-if="watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html
index 0e61f4d16..9871c9aa8 100644
--- a/modules/client/front/billing-data/index.html
+++ b/modules/client/front/billing-data/index.html
@@ -95,8 +95,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save" vn-acl="salesAssistant"></vn-submit>
-        <vn-button label="Undo changes" ng-if="watcher.dataChanged()" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            label="Undo changes"
+            ng-if="watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 
diff --git a/modules/client/front/contact/index.html b/modules/client/front/contact/index.html
index 664a59567..f1d7dbbd9 100644
--- a/modules/client/front/contact/index.html
+++ b/modules/client/front/contact/index.html
@@ -46,6 +46,9 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/client/front/credit-insurance/create/index.html b/modules/client/front/credit-insurance/create/index.html
index d1dc081b7..34ded289b 100644
--- a/modules/client/front/credit-insurance/create/index.html
+++ b/modules/client/front/credit-insurance/create/index.html
@@ -1,3 +1,9 @@
+<vn-watcher
+    vn-id="watcher"
+    data="$ctrl.creditClassification"
+    form="form"
+    save="patch">
+</vn-watcher>
 <form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
@@ -25,7 +31,13 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ui-sref="client.card.creditInsurance.index" label="Cancel"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            ui-sref="client.card.creditInsurance.index"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/client/front/credit/create/index.html b/modules/client/front/credit/create/index.html
index e3160a2ae..13ba434d0 100644
--- a/modules/client/front/credit/create/index.html
+++ b/modules/client/front/credit/create/index.html
@@ -19,8 +19,14 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.cancel()" label="Cancel"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button 
+            ng-click="$ctrl.cancel()"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-confirm
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index 0523f9fb6..782a5d6f2 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -202,8 +202,15 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button label="Undo changes" ng-if="$ctrl.$.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            label="Undo changes"
+            ng-if="watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-confirm 
diff --git a/modules/client/front/greuge/create/index.html b/modules/client/front/greuge/create/index.html
index dc53f9e2b..7cbacb349 100644
--- a/modules/client/front/greuge/create/index.html
+++ b/modules/client/front/greuge/create/index.html
@@ -40,7 +40,13 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.goToIndex()" label="Cancel"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            ng-click="$ctrl.goToIndex()"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/client/front/note/create/index.html b/modules/client/front/note/create/index.html
index aba03aafb..ca61c74b3 100644
--- a/modules/client/front/note/create/index.html
+++ b/modules/client/front/note/create/index.html
@@ -17,8 +17,14 @@
             </vn-textarea>
         </vn-horizontal>
     </vn-card>
-    <vn-button-bar> 
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.cancel()" label="Cancel"></vn-button>
+    <vn-button-bar>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            ng-click="$ctrl.cancel()"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/client/front/recovery/create/index.html b/modules/client/front/recovery/create/index.html
index 7747bb4d7..8b4942494 100644
--- a/modules/client/front/recovery/create/index.html
+++ b/modules/client/front/recovery/create/index.html
@@ -32,7 +32,13 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-click="$ctrl.cancel()" label="Cancel"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button 
+            ng-click="$ctrl.cancel()"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
diff --git a/modules/client/front/sample/create/index.html b/modules/client/front/sample/create/index.html
index d8bd4712a..fe2edfc52 100644
--- a/modules/client/front/sample/create/index.html
+++ b/modules/client/front/sample/create/index.html
@@ -53,12 +53,19 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Send"></vn-submit>
-        <vn-button ng-if="sampleType.selection.hasPreview"
+        <vn-submit
+            ng-if="sampleType.selection"
+            label="Send">
+        </vn-submit>
+        <vn-button
+            ng-if="sampleType.selection.hasPreview"
             label="Preview" 
             ng-click="$ctrl.showPreview()">
         </vn-button>
-        <vn-button ui-sref="client.card.sample.index" label="Cancel"></vn-button>
+        <vn-button
+            ui-sref="client.card.sample.index"
+            label="Cancel">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-dialog
diff --git a/modules/client/front/web-access/index.html b/modules/client/front/web-access/index.html
index f7488dbdf..20060f329 100644
--- a/modules/client/front/web-access/index.html
+++ b/modules/client/front/web-access/index.html
@@ -26,9 +26,20 @@
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
-        <vn-button ng-if="$ctrl.canChangePassword" label="Change password" vn-dialog="change-pass"></vn-button>
-        <vn-button label="Undo changes" ng-if="$ctrl.$.form.$dirty" ng-click="watcher.loadOriginalData()"></vn-button>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            label="Undo changes"
+            ng-if="$ctrl.$.form.$dirty"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
+        <vn-button
+            ng-if="$ctrl.canChangePassword"
+            label="Change password"
+            vn-dialog="change-pass">
+        </vn-button>
     </vn-button-bar>
 </form>
 <vn-dialog