diff --git a/core/client/app/components/gh-validation-status-container.js b/core/client/app/components/gh-validation-status-container.js
index c859eaf857..f54a1c50e1 100644
--- a/core/client/app/components/gh-validation-status-container.js
+++ b/core/client/app/components/gh-validation-status-container.js
@@ -11,7 +11,11 @@ import ValidationStateMixin from 'ghost/mixins/validation-state';
 export default Ember.Component.extend(ValidationStateMixin, {
     classNameBindings: ['errorClass'],
 
-    errorClass: Ember.computed('hasError', function () {
-        return this.get('hasError') ? 'error' : 'success';
+    errorClass: Ember.computed('hasError', 'hasValidated.[]', function () {
+        if (this.hasValidated.contains(this.get('property'))) {
+            return this.get('hasError') ? 'error' : 'success';
+        } else {
+            return '';
+        }
     })
 });