diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index 99f5efba4bda7c5a2160df4a65c57be783623716..d454d109476d6ce0589a7d282a0c61dc3b11dc39 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -56,9 +56,9 @@
         <div>
             <table>
                 <caption>[% lh.maketext("List of user attributes") %]</caption>
-    [% FOREACH attribute IN [ 'cn', 'displayName', 'givenName', 'sn', 'mail', 'schacHomeOrganization', 'schacHomeOrganizationType', 'eduPersonPrincipalName', 'eduPersonAffiliation', 'eduPersonScopedAffiliation' ] %]
+    [% FOREACH pair IN attributes.pairs %]
                 <tr>
-                    <th>[% attribute %]</th><td>[% attributes.$attribute.join(', ') %]</td>
+                    <th>[% pair.key %]</th><td>[% pair.value.join(', ') %]</td>
                 </tr>
     [% END %]
                 <tr>