diff --git a/template/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl
index d7053200d..065a1c8ee 100644
--- a/template/yoga/admin/comments.tpl
+++ b/template/yoga/admin/comments.tpl
@@ -1,9 +1,6 @@
 <h2>{lang:User comments validation}</h2>
 
 <form method="post" action="{F_ACTION}">
-
-  <input type="hidden" name="list" value="{LIST}" />
-
   <!-- BEGIN comment -->
   <div class="comment">
     <a class="illustration" href="{comment.U_PICTURE}"><img src="{comment.TN_SRC}" /></a>
@@ -17,6 +14,7 @@
   <!-- END comment -->
 
   <p class="bottomButtons">
+    <input type="hidden" name="list" value="{LIST}" />
     <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
     <input type="submit" name="validate-all" value="{lang:Validate All}" />
     <input type="submit" name="reject-all" value="{lang:Reject All}" />
diff --git a/template/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
index 63b7fa5b6..5adce8833 100644
--- a/template/yoga/admin/element_set_unit.tpl
+++ b/template/yoga/admin/element_set_unit.tpl
@@ -8,13 +8,10 @@
 </p>
 
 <form action="{F_ACTION}" method="POST">
-
-<input type="hidden" name="list" value="{IDS_LIST}" />
-
 <fieldset>
 
   <legend>{lang:Display options}</legend>
-
+  <input type="hidden" name="list" value="{IDS_LIST}" />
   <p>{lang:elements per page} :
       <a href="{U_ELEMENTS_PAGE}&amp;display=5">5</a>
     | <a href="{U_ELEMENTS_PAGE}&amp;display=10">10</a>
diff --git a/template/yoga/admin/tags.tpl b/template/yoga/admin/tags.tpl
index c39181580..83e95acb3 100644
--- a/template/yoga/admin/tags.tpl
+++ b/template/yoga/admin/tags.tpl
@@ -5,11 +5,9 @@
 <form action="{F_ACTION}" method="post">
 
   <!-- BEGIN edit_tags -->
-  <input type="hidden" name="edit_list" value="{edit_tags.LIST}" />
-
   <fieldset>
     <legend>{lang:Edit tags}</legend>
-
+    <input type="hidden" name="edit_list" value="{edit_tags.LIST}" />
     <table class="table2">
       <tr class="throw">
         <th>{lang:Current name}</th>
diff --git a/template/yoga/admin/waiting.tpl b/template/yoga/admin/waiting.tpl
index 10e8e3ff7..40c2d1850 100644
--- a/template/yoga/admin/waiting.tpl
+++ b/template/yoga/admin/waiting.tpl
@@ -2,9 +2,6 @@
 <h2>{lang:title_waiting}</h2>
 
 <form action="{F_ACTION}" method="post" id="waiting">
-
-  <input type="hidden" name="list" value="{LIST}" />
-
   <table style="width:100%;" >
     <tr class="throw">
       <th style="width:20%;">{L_CATEGORY}</th>
@@ -38,6 +35,7 @@
   </table>
 
   <p class="bottomButtons">
+    <input type="hidden" name="list" value="{LIST}" />
     <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
     <input type="submit" name="validate-all" value="{lang:Validate All}" {TAG_INPUT_ENABLED}/>
     <input type="submit" name="reject-all" value="{lang:Reject All}" {TAG_INPUT_ENABLED}/>
diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl
index 3cfece113..b3837f454 100644
--- a/template/yoga/profile.tpl
+++ b/template/yoga/profile.tpl
@@ -19,11 +19,9 @@
 
 <form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
 
-  <input type="hidden" name="userid" value="{USERID}" />
-
   <fieldset>
     <legend>{L_REGISTRATION_INFO}</legend>
-
+    <input type="hidden" name="userid" value="{USERID}" />
     <ul>
       <li>
         <span class="property">{lang:Username}</span>