diff --git a/templates/web/edugain/select_sp.tt2.html b/templates/web/edugain/select_sp.tt2.html
index 10f7b4e1413c909e352d00f724764b4a23772e2b..1ee1bb396ca8abe78eccab25b1b7a024aa9101fe 100644
--- a/templates/web/edugain/select_sp.tt2.html
+++ b/templates/web/edugain/select_sp.tt2.html
@@ -17,7 +17,7 @@
 
         [% FOREACH group IN groups.keys.sort() %]
         <fieldset>
-            <label for="[% group %]">[% groups.$group.label %]</label>
+            <legend>[% groups.$group.label %]</legend>
             <select id="[% group %]" name="[% group %]">
                 <option value=""></option>
             [% FOREACH entity IN groups.$group.entities.sort('name') %]
diff --git a/templates/web/renater/select_sp.tt2.html b/templates/web/renater/select_sp.tt2.html
index 7185249b55844cdc381d30c8b5dd1c6022ef61e3..8bde0d268f12cbd6300df73f9f1d2ee4b29f983f 100644
--- a/templates/web/renater/select_sp.tt2.html
+++ b/templates/web/renater/select_sp.tt2.html
@@ -17,7 +17,7 @@
 
         [% FOREACH group IN groups.keys.sort() %]
         <fieldset>
-            <label for="[% group %]">[% groups.$group.label %]</label>
+            <legend>[% groups.$group.label %]</legend>
             <select id="[% group %]" name="[% group %]">
                 <option value=""></option>
             [% FOREACH entity IN groups.$group.entities.sort('name') %]