diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 7295141cdfd33872f6fe29a1b420eac1e2b40d38..3e2a01e10210d003249b5f9c309fc9c384794c77 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -289,7 +289,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
       ptln('<td class="centeralign" colspan="3">',4);
 
-      ptln('  <form method="post" action="'.wl($ID).'">',4);
+      ptln('  <form method="post" action="'.wl($ID).'"><div class="no">',4);
       ptln('    <input type="hidden" name="do"   value="admin" />',4);
       ptln('    <input type="hidden" name="page" value="acl" />',4);
       ptln('    <input type="hidden" name="acl_cmd" value="save" />',4);
@@ -316,7 +316,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
       ptln(     $this->admin_acl_html_checkboxes(0,false),8);
 
       ptln('    <input type="submit" class="edit" value="'.$lang['btn_save'].'" />',4);
-      ptln('  </form>');
+      ptln('  </div></form>');
       ptln('</td>',4);
       ptln('</tr>',2);
     }
@@ -371,7 +371,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
         // update form
         ptln('<td class="centeralign">',4);
-        ptln('  <form method="post" action="'.wl($ID).'">',4);
+        ptln('  <form method="post" action="'.wl($ID).'"><div class="no">',4);
         ptln('    <input type="hidden" name="do"   value="admin" />',4);
         ptln('    <input type="hidden" name="page" value="acl" />',4);
         ptln('    <input type="hidden" name="acl_cmd"   value="save" />',4);
@@ -380,7 +380,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         ptln('    <input type="hidden" name="acl_user"  value="'.formtext($name).'" />',4);
         ptln(     $this->admin_acl_html_checkboxes($conf['perm'],$ispage),8);
         ptln('    <input type="submit" class="edit" value="'.$lang['btn_update'].'" />',4);
-        ptln('  </form>');
+        ptln('  </div></form>');
         ptln('</td>',4);
 
 
@@ -389,7 +389,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         $ask  = $lang['del_confirm'].'\\n';
         $ask .= $id.'  '.$conf['name'].'  '.$conf['perm'];
         ptln('<td class="centeralign">',4);
-        ptln('  <form method="post" action="'.wl($ID).'" onsubmit="return confirm(\''.str_replace('\\\\n','\\n',addslashes($ask)).'\')">',4);
+        ptln('  <form method="post" action="'.wl($ID).'" onsubmit="return confirm(\''.str_replace('\\\\n','\\n',addslashes($ask)).'\')"><div class="no">',4);
         ptln('    <input type="hidden" name="do"        value="admin" />',4);
         ptln('    <input type="hidden" name="page"      value="acl" />',4);
         ptln('    <input type="hidden" name="acl_cmd"   value="delete" />',4);
@@ -397,7 +397,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         ptln('    <input type="hidden" name="acl_type" value="'.$type.'" />',4);
         ptln('    <input type="hidden" name="acl_user"  value="'.formtext($name).'" />',4);
         ptln('    <input type="submit" class="edit" value="'.$lang['btn_delete'].'" />',4);
-        ptln('  </form>',4);
+        ptln('  </div></form>',4);
         ptln('</td>',4);
 
         ptln('</tr>',2);
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 715833843d7679ff1b1e28927a58ca4b18dfecf8..aff34910f93a2963f1e1cc9bce758971ce71a915 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -207,11 +207,11 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         ptln("          <input type=\"submit\" name=\"fn[last]\" ".$page_buttons['last']." value=\"".$this->lang['last']."\" />");
         ptln("        </span>");
         ptln("        <input type=\"submit\" name=\"fn[search][clear]\" value=\"".$this->lang['clear']."\" />");
+        ptln("        <input type=\"hidden\" name=\"do\"    value=\"admin\" />");
+        ptln("        <input type=\"hidden\" name=\"page\"  value=\"usermanager\" />");
         ptln("      </td></tr>");
         ptln("    </tbody>");
         ptln("  </table>");
-        ptln("  <input type=\"hidden\" name=\"do\"    value=\"admin\" />");
-        ptln("  <input type=\"hidden\" name=\"page\"  value=\"usermanager\" />");
 
         $this->_htmlFilterSettings(2);