diff --git a/templates/web/en/errors.tt2.html b/templates/web/en/errors.tt2.html
index 25b6a0c4f046775e56d3d7e8eaa347faf652ed64..bb4d25790f04c2f759c6bab959ab0118e5deac1b 100644
--- a/templates/web/en/errors.tt2.html
+++ b/templates/web/en/errors.tt2.html
@@ -1,34 +1,32 @@
-[% IF errors %]
- [% FOREACH err IN errors %]
+[% FOREACH err IN errors %]
 
 <p class="ui-state-error ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-  Error:
+    Error:
 
-  [% IF err == 'unknown_action' %]
-   unknown action
+    [% IF err == 'unknown_action' %]
+    unknown action
 
-  [% ELSIF err == 'internal' %]
-   internal error; administrators of the federation registry have been notified.
+    [% ELSIF err == 'internal' %]
+    internal error; administrators of the federation registry have been notified.
 
-  [% ELSIF err == 'wrong_token' %]
-   the validation token you provided is incorrect or it has already been used
+    [% ELSIF err == 'wrong_token' %]
+    the validation token you provided is incorrect or it has already been used
 
-  [% ELSIF err == 'wrong_token_for_sp' %]
-   the validation token you provided cannot be used to obtain test accounts for this service provider ([% entityid %])
+    [% ELSIF err == 'wrong_token_for_sp' %]
+    the validation token you provided cannot be used to obtain test accounts for this service provider ([% entityid %])
 
-  [% ELSIF err == 'accounts_creation_failed' %]
-   failed to create your test accounts
+    [% ELSIF err == 'accounts_creation_failed' %]
+    failed to create your test accounts
 
-  [% ELSIF (matches = err.match('missing_(\w+)')) %]
-   missing parameter '[% matches.0 %]'
+    [% ELSIF (matches = err.match('missing_(\w+)')) %]
+    missing parameter '[% matches.0 %]'
 
-  [% ELSE %]
-   [% err %]
+    [% ELSE %]
+    [% err %]
 
-  [% END %] <!-- autorisation -->
+    [% END %]
 </p>
 <br/>
- [% END %] <!-- FOREACH -->
-
- You can report the issue to the administrators (<a href="mailto:[% app.support_email %]>">[% app.support_email %]</a>).
 [% END %]
+
+You can report the issue to the administrators (<a href="mailto:[% app.support_email %]>">[% app.support_email %]</a>).
diff --git a/templates/web/fr/errors.tt2.html b/templates/web/fr/errors.tt2.html
index 25b6a0c4f046775e56d3d7e8eaa347faf652ed64..bb4d25790f04c2f759c6bab959ab0118e5deac1b 100644
--- a/templates/web/fr/errors.tt2.html
+++ b/templates/web/fr/errors.tt2.html
@@ -1,34 +1,32 @@
-[% IF errors %]
- [% FOREACH err IN errors %]
+[% FOREACH err IN errors %]
 
 <p class="ui-state-error ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-  Error:
+    Error:
 
-  [% IF err == 'unknown_action' %]
-   unknown action
+    [% IF err == 'unknown_action' %]
+    unknown action
 
-  [% ELSIF err == 'internal' %]
-   internal error; administrators of the federation registry have been notified.
+    [% ELSIF err == 'internal' %]
+    internal error; administrators of the federation registry have been notified.
 
-  [% ELSIF err == 'wrong_token' %]
-   the validation token you provided is incorrect or it has already been used
+    [% ELSIF err == 'wrong_token' %]
+    the validation token you provided is incorrect or it has already been used
 
-  [% ELSIF err == 'wrong_token_for_sp' %]
-   the validation token you provided cannot be used to obtain test accounts for this service provider ([% entityid %])
+    [% ELSIF err == 'wrong_token_for_sp' %]
+    the validation token you provided cannot be used to obtain test accounts for this service provider ([% entityid %])
 
-  [% ELSIF err == 'accounts_creation_failed' %]
-   failed to create your test accounts
+    [% ELSIF err == 'accounts_creation_failed' %]
+    failed to create your test accounts
 
-  [% ELSIF (matches = err.match('missing_(\w+)')) %]
-   missing parameter '[% matches.0 %]'
+    [% ELSIF (matches = err.match('missing_(\w+)')) %]
+    missing parameter '[% matches.0 %]'
 
-  [% ELSE %]
-   [% err %]
+    [% ELSE %]
+    [% err %]
 
-  [% END %] <!-- autorisation -->
+    [% END %]
 </p>
 <br/>
- [% END %] <!-- FOREACH -->
-
- You can report the issue to the administrators (<a href="mailto:[% app.support_email %]>">[% app.support_email %]</a>).
 [% END %]
+
+You can report the issue to the administrators (<a href="mailto:[% app.support_email %]>">[% app.support_email %]</a>).