diff --git a/resources/css/style.css b/resources/css/style.css
index cc8c96303893a482315d43e93d29f1e883a24051..27942834fd32c47a486d429ba0122ac38d03abe4 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -203,6 +203,16 @@ main form {
     float:none !important;
 }
 
+ul.columns4 {
+    column-count: 4;
+    list-style-type: none;
+}
+
+ul.columns3 {
+    column-count: 3;
+    list-style-type: none;
+}
+
 .nocursor{
     cursor: default!important;
     opacity:0.6;
diff --git a/templates/web/edugain/complete_challenge.tt2.html b/templates/web/edugain/complete_challenge.tt2.html
index 880e67505dbe1b915cbd3a8c2092405fc5876d03..b2116b6e65f90adeca3eec818b696990c5e5969a 100644
--- a/templates/web/edugain/complete_challenge.tt2.html
+++ b/templates/web/edugain/complete_challenge.tt2.html
@@ -24,12 +24,16 @@
         </fieldset>
         <fieldset>
             <legend>[% lh.maketext("Account profiles:") %]</legend>
+            <ul class="columns4">
 [% FOREACH profile IN profiles %]
     [% template = profile _ '.tt2' %]
     [% PROCESS $template scope=account.scope() id=account.id() | trim %]
-            <input type="checkbox" id="[% profile %]" name="profiles" value="[% profile %]" checked/>
-            <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${lh.language_tag()} %]"></span></label>
+                <li>
+                    <input type="checkbox" id="[% profile %]" name="profiles" value="[% profile %]" checked/>
+                    <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${lh.language_tag()} %]"></span></label>
+                </li>
 [% END %]
+            </ul>
 
         </fieldset>
         <input type="hidden" name="federation" value="[% federation %]"/>
diff --git a/templates/web/renater/complete_challenge.tt2.html b/templates/web/renater/complete_challenge.tt2.html
index 880e67505dbe1b915cbd3a8c2092405fc5876d03..b2116b6e65f90adeca3eec818b696990c5e5969a 100644
--- a/templates/web/renater/complete_challenge.tt2.html
+++ b/templates/web/renater/complete_challenge.tt2.html
@@ -24,12 +24,16 @@
         </fieldset>
         <fieldset>
             <legend>[% lh.maketext("Account profiles:") %]</legend>
+            <ul class="columns4">
 [% FOREACH profile IN profiles %]
     [% template = profile _ '.tt2' %]
     [% PROCESS $template scope=account.scope() id=account.id() | trim %]
-            <input type="checkbox" id="[% profile %]" name="profiles" value="[% profile %]" checked/>
-            <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${lh.language_tag()} %]"></span></label>
+                <li>
+                    <input type="checkbox" id="[% profile %]" name="profiles" value="[% profile %]" checked/>
+                    <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${lh.language_tag()} %]"></span></label>
+                </li>
 [% END %]
+            </ul>
 
         </fieldset>
         <input type="hidden" name="federation" value="[% federation %]"/>