diff --git a/templates/web/en/select_sp.tt2.html b/templates/web/en/select_sp.tt2.html
index c5a60e5ee81fd96d733580b41557b01e6f0cd2f0..2036b324620af998cda24087c1694f258fee613b 100644
--- a/templates/web/en/select_sp.tt2.html
+++ b/templates/web/en/select_sp.tt2.html
@@ -100,23 +100,18 @@ $(function() {
     <h3>Select your Service Provider</h3>
     <fieldset>
         <h3>Select your Service Provider</h3>
-        <div>
-            Please search and select the Service Provider that you want to test in
-            the list below. You must be an administrator of that Service Provider to
-            continue afterwards.
-            <br/><br/>
-
-            <label for="entityid">Type the SP name or entityID to search for it.</label>
-            Note that only Service Providers are in the list which are included in the eduGAIN metadata.<br/>
-
-            <select id="entityid" name="entityid" class="required">
-                <option value="">Select your Service Provider below</option>
-                [% FOREACH entity IN metadata.sort('display_name') %]
-                <option value="[% entity.entityid %]">[% IF entity.display_name %][% entity.display_name %] [% END %]([% entity.entityid %])</option>
-                [% END %]
-            </select>
-            <br/>
-        </div>
+        <p>Please select the Service Provider that you want to test in the list
+        below. You must be an administrator of that Service Provider to
+        continue afterwards.</p>
+
+        <label for="entityid">Type the name or entityID of Service Provider to test:</label>
+        <br>
+        <select id="entityid" name="entityid" class="required">
+            [% FOREACH entity IN metadata.sort('display_name') %]
+            <option value="[% entity.entityid %]">[% IF entity.display_name %][% entity.display_name %] [% END %]([% entity.entityid %])</option>
+            [% END %]
+        </select>
+        <p>Only Service Providers included in eduGAIN metadata are included in the list.</p>
     </fieldset>
 
     <h3>Select your email address</h3>
diff --git a/templates/web/fr/select_sp.tt2.html b/templates/web/fr/select_sp.tt2.html
index b42551c7f55fd093da7d823394ce84194e32a30f..f8653d5b26f5cf02330d3b34e6462145aa141b65 100644
--- a/templates/web/fr/select_sp.tt2.html
+++ b/templates/web/fr/select_sp.tt2.html
@@ -97,37 +97,32 @@ $(function() {
       action="[% env.SCRIPT_NAME %]"
       method="POST">
 
-    <h3>Select your Service Provider</h3>
+    <h3>Sélectionnez votre fournisseur de service</h3>
     <fieldset>
-        <h3>Select your Service Provider</h3>
-        <div>
-            Please search and select the Service Provider that you want to test in
-            the list below. You must be an administrator of that Service Provider to
-            continue afterwards.
-            <br/><br/>
-
-            <label for="entityid">Type the SP name or entityID to search for it.</label>
-            Note that only Service Providers are in the list which are included in the eduGAIN metadata.<br/>
-
-            <select id="entityid" name="entityid" class="required">
-                <option value="">Select your Service Provider below</option>
-                [% FOREACH entity IN metadata.sort('display_name') %]
-                <option value="[% entity.entityid %]">[% IF entity.display_name %][% entity.display_name %] [% END %]([% entity.entityid %])</option>
-                [% END %]
-            </select>
-            <br/>
-        </div>
+        <h3>Sélectionnez votre fournisseur de service</h3>
+        <p>Veuillez sélectionner le fournisseur de service (Service Provider)
+        que vous désirez tester dans la liste ci-dessous. Vous devez être
+        administrateur de ce service pour continuer ensuite.</p>
+
+        <label for="entityid">Entrez le nom ou l'identifiant (entityID) du fournisseur de service à tester:</label>
+        <br>
+        <select id="entityid" name="entityid" class="required">
+            [% FOREACH entity IN metadata.sort('display_name') %]
+            <option value="[% entity.entityid %]">[% IF entity.display_name %][% entity.display_name %] [% END %]([% entity.entityid %])</option>
+            [% END %]
+        </select>
+        <p>Seuls les fournisseurs de services inclus dans les métadonnées de la fédération eduGAIN sont inclus dans la liste</p>
     </fieldset>
 
-    <h3>Select your email address</h3>
+    <h3>Sélectionnez votre adresse e-mail</h3>
     <fieldset>
         <div data-mode="async" data-url="/rest/service/0"></div>
     </fieldset>
 
-    <h3>Complete email challenge</h3>
+    <h3>Validez le challenge e-mail</h3>
     <fieldset></fieldset>
 
-    <h3>Test accounts</h3>
+    <h3>Comptes de test</h3>
     <fieldset></fieldset>