diff --git a/static/js/portico/signup.js b/static/js/portico/signup.js
index 9af27c452e..65a89550b3 100644
--- a/static/js/portico/signup.js
+++ b/static/js/portico/signup.js
@@ -46,6 +46,9 @@ $(() => {
             element.next(".help-inline.alert.alert-error").remove();
             if (element.next().is('label[for="' + element.attr("id") + '"]')) {
                 error.insertAfter(element.next()).addClass("help-inline alert alert-error");
+            } else if (element.parent().is('label[for="' + element.attr("id") + '"]')) {
+                // For checkboxes and radio-buttons
+                error.insertAfter(element.parent()).addClass("help-inline alert alert-error");
             } else {
                 error.insertAfter(element).addClass("help-inline alert alert-error");
             }
diff --git a/static/styles/portico/portico-signin.scss b/static/styles/portico/portico-signin.scss
index b79e015a21..4db9f4e7fd 100644
--- a/static/styles/portico/portico-signin.scss
+++ b/static/styles/portico/portico-signin.scss
@@ -478,10 +478,9 @@ html {
             font-size: 0.7em;
             font-weight: 600;
             text-align: left;
-            height: 0;
+            line-height: 1.2;
 
             position: relative;
-            top: -4px;
             left: 1px;
         }
 
@@ -821,11 +820,6 @@ button#register_auth_button_gitlab {
         }
     }
 
-    #id_team_subdomain-error {
-        margin-top: 5px;
-        display: block;
-    }
-
     #subdomain_section {
         .inline-block {
             width: 100%;
@@ -855,6 +849,10 @@ button#register_auth_button_gitlab {
         line-height: 1.2;
     }
 
+    .help-inline {
+        display: block;
+    }
+
     legend {
         margin-bottom: 0;