diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index 29b6559526e9654391e57a8be16a8354d1e23086..564111147b9538dd94bf5075104d81156e980c4b 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -45,6 +45,13 @@
         </button>
         <h3>[% lh.maketext("User attributes list") %]</h3>
 
+        <div class="callout warning">
+            [% lh.maketext(
+                "eduPersonAffiliation and eduPersonScopedAffiliation attributes are assigned <a href=\"[_1]\">quite differently from federation to federation</a>, therefore their values should be handled with great care."
+                "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt"
+            ) %]
+        </div>
+
         <table>
     [% FOREACH pair IN attributes.pairs %]
             <tr>
@@ -55,13 +62,6 @@
                 <th>eduPersonTargetedID:</th><td><i>[% lh.maketext("value dynamically generated for each SP") %]</i></td>
             </tr>
         </table>
-
-        <div class="callout warning">
-            [% lh.maketext(
-                "eduPersonAffiliation and eduPersonScopedAffiliation attributes are assigned <a href=\"[_1]\">quite differently from federation to federation</a>, therefore their values should be handled with great care."
-                "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt"
-            ) %]
-        </div>
     </div>
     [% END %]
 </div>
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index 7b0ae09e9f4dc7d4756a58dd757f4a13a38c4674..f8549e2a59cc519ae44ed364ac5ff606fa7027b9 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -47,6 +47,13 @@
         </button>
         <h3>[% lh.maketext("User attributes list") %]</h3>
 
+        <div class="callout alert-callout-border warning">
+            [% lh.maketext(
+                "eduPersonAffiliation and eduPersonScopedAffiliation attributes are assigned <a href=\"[_1]\">quite differently from federation to federation</a>, therefore their values should be handled with great care.",
+                "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt")
+            %]
+        </div>
+
         <table>
     [% FOREACH pair IN attributes.pairs %]
             <tr>
@@ -57,13 +64,6 @@
                 <th>eduPersonTargetedID:</th><td><i>[% lh.maketext("value dynamically generated for each SP") %]</i></td>
             </tr>
         </table>
-
-        <div class="callout alert-callout-border warning">
-            [% lh.maketext(
-                "eduPersonAffiliation and eduPersonScopedAffiliation attributes are assigned <a href=\"[_1]\">quite differently from federation to federation</a>, therefore their values should be handled with great care.",
-                "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt")
-            %]
-        </div>
     </div>
     [% END %]
 </div>