diff --git a/registration/javascript/affiliations.js b/registration/javascript/affiliations.js
index 8304153..8023f39 100644
--- a/registration/javascript/affiliations.js
+++ b/registration/javascript/affiliations.js
@@ -357,6 +357,9 @@
 
     function renderAffiliationList(data){
         if (data.length > 0) {
+            //remove error message
+            $("label.error[for='HoneyPotForm_RegistrationForm_Affiliations']").remove();
+
             var template = $('<ul><li><div class="affiliation-header">' +
                 '<span class="title"></span>' +
                 '<span class="affiliation-actions">&nbsp;' +
diff --git a/registration/javascript/edit.profile.page.js b/registration/javascript/edit.profile.page.js
index 2dfdbf7..12982f7 100755
--- a/registration/javascript/edit.profile.page.js
+++ b/registration/javascript/edit.profile.page.js
@@ -52,6 +52,17 @@ jQuery(document).ready(function($) {
         );
 
         edit_profile_form.validate({
+            onfocusout: false,
+            invalidHandler: function(form, validator) {
+                var errors = validator.numberOfInvalids();
+                if (errors) {
+                    var element = validator.errorList[0].element;
+                    var offset = (element.name == 'Affiliations') ? $(element).prev().offset().top : $(element).offset().top;
+                    $('html, body').animate({
+                        scrollTop: offset-100
+                    }, 2000);
+                }
+            },
             ignore: [],
             rules: {
                 FirstName:{required: true,regex:'[\"()=<>]+' },
@@ -194,6 +205,17 @@ jQuery(document).ready(function($) {
         );
 
         edit_speaker_profile_form.validate({
+            onfocusout: false,
+            invalidHandler: function(form, validator) {
+                var errors = validator.numberOfInvalids();
+                if (errors) {
+                    var element = validator.errorList[0].element;
+                    var offset = (element.name == 'Affiliations') ? $(element).prev().offset().top : $(element).offset().top;
+                    $('html, body').animate({
+                        scrollTop: offset-100
+                    }, 2000);
+                }
+            },
             ignore: [],
             rules: {
                 FirstName:{required: true, ValidPlainText:true },
diff --git a/registration/javascript/registration.page.js b/registration/javascript/registration.page.js
index 724e809..64f6f12 100755
--- a/registration/javascript/registration.page.js
+++ b/registration/javascript/registration.page.js
@@ -66,7 +66,11 @@ jQuery(document).ready(function($) {
             invalidHandler: function(form, validator) {
                 var errors = validator.numberOfInvalids();
                 if (errors) {
-                    validator.errorList[0].element.focus();
+                    var element = validator.errorList[0].element;
+                    var offset = (element.name == 'Affiliations') ? $(element).prev().offset().top : $(element).offset().top;
+                    $('html, body').animate({
+                        scrollTop: offset-100
+                    }, 2000);
                 }
             },
             ignore: [],
diff --git a/themes/openstack/templates/Page.ss b/themes/openstack/templates/Page.ss
index 085edbf..b17b78a 100644
--- a/themes/openstack/templates/Page.ss
+++ b/themes/openstack/templates/Page.ss
@@ -50,9 +50,10 @@
       <% include Navigation %>
       
       <!-- Page Content -->
-      $Message
-      $Layout
-
+      <div class="container">
+        $Message
+        $Layout
+      </div>
 
     <% include Footer %>
     <% include Quantcast %>