diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 0586651842..eff1025e60 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -79,18 +79,7 @@
                 $scope.content.variants[0].publish = false;
             }
         }
-
-        function countDirtyVariants() {
-            var count = 0;
-            for (var i = 0; i < $scope.content.variants.length; i++) {
-                var v = $scope.content.variants[i];
-                if (v.isDirty) {
-                    count++;
-                }
-            }
-            return count;
-        }
-
+        
         /** Returns true if the save/publish dialog should be shown when pressing the button */
         function showSaveOrPublishDialog() {
             return $scope.content.variants.length > 1;
@@ -274,6 +263,24 @@
             }
         }
 
+        /**
+         * Used to clear the dirty state for successfully saved variants when not all variant saving was successful
+         * @param {any} variants
+         */
+        function clearDirtyState(variants) {
+            for (var i = 0; i < variants.length; i++) {
+                var v = variants[i];
+                if (v.notifications) {
+                    var isSuccess = _.find(v.notifications, function (n) {
+                        return n.type === 3; //this is a success notification
+                    });
+                    if (isSuccess) {
+                        v.isDirty = false;
+                    }
+                }
+            }
+        }
+
         if ($scope.page.isNew) {
 
             $scope.page.loading = true;
@@ -382,6 +389,7 @@
                                 return $q.when(data);
                             },
                                 function (err) {
+                                    clearDirtyState($scope.content.variants);
                                     model.submitButtonState = "error";
                                     //re-map the dialog model since we've re-bound the properties
                                     dialog.variants = $scope.content.variants;
@@ -433,6 +441,7 @@
                                 return $q.when(data);
                             },
                                 function (err) {
+                                    clearDirtyState($scope.content.variants);
                                     model.submitButtonState = "error";
                                     //re-map the dialog model since we've re-bound the properties
                                     dialog.variants = $scope.content.variants;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index 54ba22c480..d7ade68398 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -58,7 +58,15 @@
                     <span>{{ variant.language.name }}</span>
                     <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
                 </div>
-                <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+
+                <div ng-if="!(variant.notifications && variant.notifications.length > 0)">
+                    <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                </div>
+
+                <div ng-repeat="notification in variant.notifications">
+                    <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
+                </div>
+                
             </div>
         </div>
     </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
index efa15ad2ef..2c8b743994 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
@@ -58,7 +58,14 @@
                     <span>{{ variant.language.name }}</span>
                     <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
                 </div>
-                <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+
+                <div ng-if="!(variant.notifications && variant.notifications.length > 0)">
+                    <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                </div>
+
+                <div ng-repeat="notification in variant.notifications">
+                    <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
+                </div>
             </div>
         </div>
     </div>