2 files changed, 9 insertions, 3 deletions

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 1b30aefb5..03ae1af65 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -401,6 +401,11 @@ textarea.form-error {
   background-color:#ffeeee;
 }
 
+// XXX This is a repeat from core
+div.label-valid {
+    background-color: white;
+}
+
 /* LAYOUT */
 
 // Padding creates page margins on mobile
@@ -1051,4 +1056,4 @@ a:hover.rap-notes-trigger {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index 6abec282c..513d6da29 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -144,7 +144,8 @@ $(function(){
         // we do this to stop things jumping around on blur
         success: function (err) { if ( form_submitted ) { err.addClass('label-valid').removeClass('label-valid-hidden').html( ' ' ); } else { err.addClass('label-valid-hidden'); } },
         errorPlacement: function( error, element ) {
-            element.parent('div').before( error );
+            var l = element.prev('label') || element;
+            l.before( error );
         },
         submitHandler: function(form) {
             if (form.submit_problem) {
@@ -286,4 +287,4 @@ $(function(){
     $('.form-focus-trigger').on('focus', function(){
         $('.form-focus-hidden').fadeIn(500);
     });
-});
\ No newline at end of file
+});