diff --git a/modules/supplier/front/basic-data/index.html b/modules/supplier/front/basic-data/index.html
index a39f07da2f..72accfb5f3 100644
--- a/modules/supplier/front/basic-data/index.html
+++ b/modules/supplier/front/basic-data/index.html
@@ -36,7 +36,15 @@
         </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
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/supplier/front/contact/index.html b/modules/supplier/front/contact/index.html
index 1df85cb4af..be0b2b2aad 100644
--- a/modules/supplier/front/contact/index.html
+++ b/modules/supplier/front/contact/index.html
@@ -69,6 +69,16 @@
         </vn-one>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save"></vn-submit>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <!-- # #2680 Undo changes button bugs -->
+        <!-- <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button> -->
     </vn-button-bar>
 </form>
\ No newline at end of file
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index a17a47319c..804be97845 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -163,8 +163,16 @@
         </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
+            disabled="!watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Undo changes"
+            disabled="!watcher.dataChanged()"
+            ng-click="watcher.loadOriginalData()">
+        </vn-button>
     </vn-button-bar>
 </form>
 <!-- New postcode dialog -->