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 1bb58c3cd2..2a4aff9da1 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,8 +13,7 @@
         <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" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
-
+                <div class="flex">
                     <umb-checkbox input-id="{{variant.htmlId}}"
                                   name="publishVariantSelector"
                                   model="variant.publish"
@@ -22,17 +21,18 @@
                                   disabled="(variant.canPublish === false)"
                                   server-validation-field="{{variant.htmlId}}" />
                     <div>
-                        <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
+                        <label for="{{variant.htmlId}}" style="margin-bottom: 2px;" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid && variant.save}">
                             <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)">
+                            <span class="db umb-permission__description" ng-if="(!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)) || variant.save === false">
                                 <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 class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
+                            <span ng-if="variant.save" class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
+                                {{valServerField}}
                                 <span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
                             </span>