diff --git a/src/main/webapp/js/validation.js b/src/main/webapp/js/validation.js
index e37468c..b54b77d 100644
--- a/src/main/webapp/js/validation.js
+++ b/src/main/webapp/js/validation.js
@@ -34,16 +34,16 @@ function validateForm() {
         }
     }
 
-    // Check if organization is filled
-    if($("#organization").val() != undefined) {
-        if($.trim($("#organization").val()).length <= 0) {
-            $("#organization").addClass('uk-input aai-form-danger');
-            $(".msg_organization_error").show();
-        } else {
-            $(".msg_organization_error").hide();
-            $("#organization").removeClass('aai-form-danger');
-        }
-    }
+    // // Check if organization is filled
+    // if($("#organization").val() != undefined) {
+    //     if($.trim($("#organization").val()).length <= 0) {
+    //         $("#organization").addClass('uk-input aai-form-danger');
+    //         $(".msg_organization_error").show();
+    //     } else {
+    //         $(".msg_organization_error").hide();
+    //         $("#organization").removeClass('aai-form-danger');
+    //     }
+    // }
 
     // Check if username is filled
     if($("#username").val() != undefined) {
@@ -59,11 +59,13 @@ function validateForm() {
 
     if($("#verification_code").val() != undefined) {
         if($.trim($("#verification_code").val()).length <= 0) {
-            $("#username").addClass('uk-input aai-form-danger');
+            $("#verification_code").addClass('uk-input aai-form-danger');
             $(".msg_verification_code_error").show();
+            $(".msg_activation_code_error").show();
             hasError = true;
         } else {
             $(".msg_verification_code_error").hide();
+            $(".msg_activation_code_error").hide();
             $("#verification_code").removeClass('aai-form-danger');
         }
     }
diff --git a/src/main/webapp/register.jsp b/src/main/webapp/register.jsp
index 4259ae4..4206b8c 100644
--- a/src/main/webapp/register.jsp
+++ b/src/main/webapp/register.jsp
@@ -47,7 +47,6 @@
         <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
             <h2 class="uk-h2 uk-margin-small-bottom">Create new OpenAIRE account</h2>
             <%--<div class="uk-text-meta uk-margin-large-bottom">Use the same credentials for all our services</div>--%>
-            <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
                     <div class="uk-grid ">
                         <!-- CENTER SIDE -->