diff --git a/templates/other/accounts.php.tt2 b/templates/other/accounts.php.tt2
index 9cabafe49047cf3562acce649b271ecacb36c57f..04acc33cf498cfe194a9c0bd4872b9a103b4bba2 100644
--- a/templates/other/accounts.php.tt2
+++ b/templates/other/accounts.php.tt2
@@ -9,11 +9,7 @@ $validTestAccounts = array (
     '[% account.internal_uid() %]:{SHA256}[% account.password_hash() %]=' => array(
         'internal_uid' => array([% account.internal_uid().quote %]),
         'associatedSP' => array([% account.entityid().quote %]),
-    [% FOREACH attribute IN [ 'cn', 'displayName', 'givenName', 'sn', 'mail', 'schacHomeOrganization', 'schacHomeOrganizationType', 'eduPersonPrincipalName' ] %]
-	[% NEXT UNLESS  attributes.$attribute %]
-        '[% attribute %]' => array([% attributes.$attribute.quote("'") %]),
-    [% END %]
-    [% FOREACH attribute IN [ 'eduPersonAffiliation', 'eduPersonScopedAffiliation' ] %]
+    [% FOREACH attribute IN [ 'cn', 'displayName', 'givenName', 'sn', 'mail', 'schacHomeOrganization', 'schacHomeOrganizationType', 'eduPersonPrincipalName', 'eduPersonAffiliation', 'eduPersonScopedAffiliation' ] %]
 	[% NEXT UNLESS  attributes.$attribute %]
         '[% attribute %]' => array([% attributes.$attribute.quote("'").join(', ') %]),
     [% END %]
diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index 56b898406556dd090fc70b6cc9e8fdb3f47a6889..e32acc5f4fb82fbd4440ed290b3566770db4091b 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -56,12 +56,7 @@
         <div>
             <table>
                 <caption>[% lh.maketext("List of user attributes") %]</caption>
-    [% FOREACH attribute IN [ 'cn', 'displayName', 'givenName', 'sn', 'mail', 'schacHomeOrganization', 'schacHomeOrganizationType', 'eduPersonPrincipalName' ] %]
-                <tr>
-                    <th>[% attribute %]</th><td>[% attributes.$attribute %]</td>
-                </tr>
-    [% END %]
-    [% FOREACH attribute IN [ 'eduPersonAffiliation', 'eduPersonScopedAffiliation' ] %]
+    [% FOREACH attribute IN [ 'cn', 'displayName', 'givenName', 'sn', 'mail', 'schacHomeOrganization', 'schacHomeOrganizationType', 'eduPersonPrincipalName', 'eduPersonAffiliation', 'eduPersonScopedAffiliation' ] %]
                 <tr>
                     <th>[% attribute %]</th><td>[% attributes.$attribute.join(', ') %]</td>
                 </tr>
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index a8bc3f2ed4f3789d0cd7b63d5d4fa6525cc9720f..9f5623b3d1244a27d0d3c0ba580ff4ec242533a2 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -58,12 +58,7 @@
         <div>
             <table>
                 <caption>[% lh.maketext("List of user attributes") %]</caption>
-    [% FOREACH attribute IN [ 'cn', 'displayName', 'givenName', 'sn', 'mail', 'schacHomeOrganization', 'schacHomeOrganizationType', 'eduPersonPrincipalName' ] %]
-                <tr>
-                    <th>[% attribute %]</th><td>[% attributes.$attribute %]</td>
-                </tr>
-    [% END %]
-    [% FOREACH attribute IN [ 'eduPersonAffiliation', 'eduPersonScopedAffiliation' ] %]
+    [% FOREACH attribute IN [ 'cn', 'displayName', 'givenName', 'sn', 'mail', 'schacHomeOrganization', 'schacHomeOrganizationType', 'eduPersonPrincipalName', 'eduPersonAffiliation', 'eduPersonScopedAffiliation' ] %]
                 <tr>
                     <th>[% attribute %]</th><td>[% attributes.$attribute.join(', ') %]</td>
                 </tr>