diff --git a/templates/web/edugain/select_sp.tt2.html b/templates/web/edugain/select_sp.tt2.html
index bdcabe8677c1ce9394302953a6d4edf111d65dcf..2735ec5883967896c5349c62a8f573896155fdd6 100644
--- a/templates/web/edugain/select_sp.tt2.html
+++ b/templates/web/edugain/select_sp.tt2.html
@@ -15,9 +15,9 @@
             [% lh.maketext("You must be an administrator of that service to continue afterwards.") %]
         </p>
 
-[% FOREACH group IN groups() %]
+[% FOREACH group IN groups %]
         <fieldset>
-            <legend>[% lh.localize(group.label) %]</legend>
+            <legend>[% lh.maketext(group.label) %]</legend>
     [% SWITCH group.type %]
         [% CASE 'list' %]
             <select id="[% group.id %]" name="[% group.id %]">
@@ -27,7 +27,7 @@
             [% END %]
             </select>
         [% CASE 'link' %]
-            <a class="button" href="[% group.url %]">[% lh.localize(group.message) %]</a>
+            <a class="button" href="[% group.url %]">[% lh.maketext(group.message) %]</a>
     [% END %]
         </fieldset>
 [% END %]
@@ -90,8 +90,6 @@ $( document ).ready(function() {
 
                     // retrieve federation and entityid
                     var entity     = this.element.val();
-                    var federation = this.element.find('option:selected').attr('data-federation');
-                    $("#federation").val(federation);
                     $("#entityid").val(entity);
                 },