diff --git a/src/Umbraco.Tests/Web/ModelStateExtensionsTests.cs b/src/Umbraco.Tests/Web/ModelStateExtensionsTests.cs
index ef2565799f..9fc3cee4ef 100644
--- a/src/Umbraco.Tests/Web/ModelStateExtensionsTests.cs
+++ b/src/Umbraco.Tests/Web/ModelStateExtensionsTests.cs
@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Web.Http.ModelBinding;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Web;
 
@@ -19,10 +17,7 @@ namespace Umbraco.Tests.Web
         {
             var ms = new ModelStateDictionary();
             var localizationService = new Mock<ILocalizationService>();
-            var languageList = new List<ILanguage> { new Language("en-US") };
-
-            localizationService.Setup(x => x.GetAllLanguages()).Returns(languageList);
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-us");
+            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
             ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); //invariant property
             ms.AddPropertyError(new ValidationResult("title missing"), "title", "en-US"); //variant property
@@ -47,9 +42,6 @@ namespace Umbraco.Tests.Web
         {
             var ms = new ModelStateDictionary();
             var localizationService = new Mock<ILocalizationService>();
-            var languageList = new List<ILanguage> { new Language("en-US") };
-
-            localizationService.Setup(x => x.GetAllLanguages()).Returns(languageList);
             localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
             ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); //invariant property
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 2a4aff9da1..1bb58c3cd2 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
@@ -13,7 +13,8 @@
         <div class="umb-list-item"
              ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter track by variant.compositeId">
             <ng-form name="publishVariantSelectorForm">
-                <div class="flex">
+                <div class="flex" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
+
                     <umb-checkbox input-id="{{variant.htmlId}}"
                                   name="publishVariantSelector"
                                   model="variant.publish"
@@ -21,18 +22,17 @@
                                   disabled="(variant.canPublish === false)"
                                   server-validation-field="{{variant.htmlId}}" />
                     <div>
-                        <label for="{{variant.htmlId}}" style="margin-bottom: 2px;" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid && variant.save}">
+                        <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                             <span>{{ variant.language.name }}</span>
                             <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
 
-                            <span class="db umb-permission__description" ng-if="(!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)) || variant.save === false">
+                            <span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                 <umb-variant-state variant="variant"></umb-variant-state>
                                 <span ng-if="variant.language.isMandatory"> - </span>
                                 <span ng-if="variant.language.isMandatory" ng-class="{'text-error': (variant.language.isMandatory && variant.willPublish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
                             </span>
 
-                            <span ng-if="variant.save" class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                {{valServerField}}
+                            <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                 <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
index 4aa8313d38..e851029024 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
@@ -42,7 +42,7 @@
             <div class="umb-list-item umb-list--condensed"
                  ng-repeat="variant in vm.variants">
                 <ng-form name="publishVariantSelectorForm">
-                    <div class="flex">
+                    <div class="flex" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
 
                         <umb-checkbox
                             input-id="{{variant.htmlId}}"
@@ -52,15 +52,15 @@
                             server-validation-field="{{variant.htmlId}}"/>
 
                         <div>
-                            <label for="{{variant.htmlId}}" style="margin-bottom: 0;" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid && variant.save}">
+                            <label for="{{variant.htmlId}}" style="margin-bottom: 0;">
                                 <span>{{ variant.language.name }}</span>
 
-                                <span class="db umb-permission__description" ng-if="(!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)) || variant.save === false">
+                                <span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                     <umb-variant-state variant="variant"></umb-variant-state>
                                     <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                                 </span>
 
-                                <span ng-if="variant.save" class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
+                                <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
                                     <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                                 </span>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
index 91422ee565..930e001842 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
@@ -86,7 +86,7 @@
 
             <div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter">
                 <ng-form name="scheduleSelectorForm">
-                    <div class="flex">
+                    <div class="flex" ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid}">
 
                         <umb-checkbox
                             input-id="{{'saveVariantSelector_' + variant.language.culture}}"
@@ -96,11 +96,11 @@
 
                         <div>
 
-                            <label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px; " ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid && variant.save}">
+                            <label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
 
                                 <span class="db umb-permission__description"
-                                      ng-if="(!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)) || variant.save === false">
+                                      ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
                                     <umb-variant-state variant="variant"></umb-variant-state>
                                     <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
                                 </span>
@@ -166,7 +166,7 @@
                                    name="saveVariantReleaseDate"
                                    val-server-field="{{variant.htmlId}}" />
 
-                            <div ng-if="variant.save" ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
+                            <div ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
                                 <div class="umb-permission__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
                             </div>
 
diff --git a/src/Umbraco.Web/ModelStateExtensions.cs b/src/Umbraco.Web/ModelStateExtensions.cs
index a87e311d6e..46be12cae8 100644
--- a/src/Umbraco.Web/ModelStateExtensions.cs
+++ b/src/Umbraco.Web/ModelStateExtensions.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web
 {
@@ -40,7 +39,7 @@ namespace Umbraco.Web
         {
             return state.Where(v => v.Key.StartsWith(prefix + ".")).All(v => !v.Value.Errors.Any());
         }
-
+        
         /// <summary>
         /// Adds the error to model state correctly for a property so we can use it on the client side.
         /// </summary>
@@ -86,15 +85,12 @@ namespace Umbraco.Web
                 .Select(x => x.Split('.')) //split into parts
                 .Where(x => x.Length >= 3 && x[0] == "_Properties") //only choose _Properties errors
                 .Select(x => x[2]) //select the culture part
-                .Where(x => !x.IsNullOrWhiteSpace()).ToList(); //if it has a value
-
-            var invariantProperty = cultureErrors.Any(x => x == "invariant");
-
-            // if invariant property, get all the languages as we need to show validation errors 
-            // even if the property is only editable on the default language
-            cultureErrors = invariantProperty
-                ? localizationService.GetAllLanguages().Select(x => x.IsoCode).ToList()
-                : cultureErrors.Distinct().ToList();
+                .Where(x => !x.IsNullOrWhiteSpace()) //if it has a value
+                //if it's marked "invariant" than return the default language, this is because we can only edit invariant properties on the default language
+                //so errors for those must show up under the default lang.
+                .Select(x => x == "invariant" ? localizationService.GetDefaultLanguageIsoCode() : x) 
+                .Distinct()
+                .ToList();
 
             return cultureErrors;
         }
@@ -173,22 +169,22 @@ namespace Umbraco.Web
         public static JsonResult ToJsonErrors(this ModelStateDictionary state)
         {
             return new JsonResult
-            {
-                Data = new
                 {
-                    success = state.IsValid.ToString().ToLower(),
-                    failureType = "ValidationError",
-                    validationErrors = from e in state
-                                       where e.Value.Errors.Count > 0
-                                       select new
-                                       {
-                                           name = e.Key,
-                                           errors = e.Value.Errors.Select(x => x.ErrorMessage)
-                                           .Concat(
-                                               e.Value.Errors.Where(x => x.Exception != null).Select(x => x.Exception.Message))
-                                       }
-                }
-            };
+                    Data = new
+                        {
+                            success = state.IsValid.ToString().ToLower(),
+                            failureType = "ValidationError",
+                            validationErrors = from e in state
+                                               where e.Value.Errors.Count > 0
+                                               select new
+                                                   {
+                                                       name = e.Key,
+                                                       errors = e.Value.Errors.Select(x => x.ErrorMessage)
+                                                   .Concat(
+                                                       e.Value.Errors.Where(x => x.Exception != null).Select(x => x.Exception.Message))
+                                                   }
+                        }
+                };
         }
 
     }