diff --git a/templates/web/validate_token.tt2.html b/templates/web/validate_token.tt2.html
index 89258eff6f301dcac77fd299deb2b3a482ab0fe7..d8b3bd679f2ac86c226e0ae836fb581185d4960f 100644
--- a/templates/web/validate_token.tt2.html
+++ b/templates/web/validate_token.tt2.html
@@ -48,14 +48,14 @@
 				<caption>List of user attributes</caption>
             [% FOREACH attribute IN account_profile.pairs -%]
               [% NEXT IF attribute.key.match('^(type|comment)$') %]
-              [% IF attribute.key == 'eduPersonAffiliation' || attribute.key == 'eduPersonScoppedAffiliation' %](1) [% END %]
+              
               [% IF attribute.value.isa('SCALAR') -%]
 				<tr>
-					<th>[% attribute.key %]:</th><td> [% attribute.value %]</td>
+					<th>[% attribute.key %][% IF attribute.key == 'eduPersonAffiliation' || attribute.key == 'eduPersonScopedAffiliation' %](1) [% END %]:</th><td> [% attribute.value %]</td>
 				</tr>
 			  [% ELSE -%]
 				<tr>
-					<th>[% attribute.key %]:</th><td> [% attribute.value.join(",") %]</td>
+					<th>[% attribute.key %][% IF attribute.key == 'eduPersonAffiliation' || attribute.key == 'eduPersonScopedAffiliation' %](1) [% END %]:</th><td> [% attribute.value.join(",") %]</td>
 				</tr>
 			  [% END %]
             [% END %]