diff --git a/templates/web/validate_token.tt2.html b/templates/web/validate_token.tt2.html
index 3583e2d5813013f0119b784b9f4ca137c223c166..bd04d0eb2cf12188db83d57f7e8e952bf1b82e07 100644
--- a/templates/web/validate_token.tt2.html
+++ b/templates/web/validate_token.tt2.html
@@ -10,11 +10,7 @@
 
 	<p>You can now use these test accounts to login at your federated service.<br/>
 <strong>To do so, select the "[% conf.idp_displayname %]" when choosing an organisation to login at.</strong></p>
-	<p><strong>Please keep a record of the above user names and passwords</strong> because currently there is no mecanism to retrieve the above credentials once you close this page. If you forget the username and passowrds, you can however request new test accounts.</p>
 
-<div class="alert-box warning radius">
-	<p>Note that these test accounts will automatically expire in [% conf.accounts_validity_period %] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[% sp_entityid %]</strong>.</p>
-</div>
 
 </div>
 
@@ -73,6 +69,12 @@
     [% END %]
     
 
+</div>
+
+	<p><strong>Please keep a record of the above user names and passwords</strong> because currently there is no mecanism to retrieve the above credentials once you close this page. If you forget the username and passwords, you can however request new test accounts.</p>
+
+<div class="alert-box warning radius">
+	<p>Note that these test accounts will automatically expire in [% conf.accounts_validity_period %] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[% sp_entityid %]</strong>.</p>
 </div>
 
 <p class="align-center"><Strong>Thank you for using the [% conf.app_name %]</strong></p>