diff --git a/templates/web/select_email.tt2.html b/templates/web/select_email.tt2.html
index d4a6399c9c3a86495fa63e351856627d4a956e1c..144535af67d43eb3b614b73880ab39ae1d0592a4 100644
--- a/templates/web/select_email.tt2.html
+++ b/templates/web/select_email.tt2.html
@@ -3,11 +3,12 @@
 
 <fieldset class="scrollable">
 [% IF provider.contacts.defined %]
-    <label for="entityid">[% lh.maketext("Select the email address where an email challenge can be sent to validate your identity:") %]</label>
-    <br>
+    <p>[% lh.maketext("Select the email address where an email challenge can be sent to validate your identity:") %]</p>
     <div class="radio_inline">
     [% FOREACH email IN provider.contacts.sort %]
-        <input name="email" value="[% email %]" type="radio" class="required"/><label for="email">[% email %]</label><br/>
+        <input id="[% email %]" name="email" value="[% email %]" type="radio" class="required"/>
+        <label for="[% email %]">[% email %]</label>
+        <br/>
     [% END %]
         <input type="hidden" name="entityid" value="[% provider.entityid %]" id="entityid"/>
     </div>