diff --git a/inc/html.php b/inc/html.php
index 4c206327d947fdf7f3569d35b44fc6daa3bd0e90..6e187ebe1e5a671931cfded36e96e1e64eec2b5d 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1424,7 +1424,7 @@ function html_admin(){
 
     // data security check
     // @todo: could be checked and only displayed if $conf['savedir'] is under the web root
-    echo '<a style="border:none; float:right;" target="_blank"
+    echo '<a style="border:none; float:right;"
             href="http://www.dokuwiki.org/security#web_access_security">
             <img src="data/security.png" alt="Your data directory seems to be protected properly."
              onerror="this.parentNode.style.display=\'none\'" /></a>';
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index d245d3fce7bbc67e484bc7536d6f6df96ead3d8b..e24f3b87b3c3d146aa900533cd4e07f2831198af 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -113,7 +113,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       // rewrite config is broken. Add $ID as hidden field to remember
       // current ID in most cases.
       ptln('<form action="'.script().'" method="post">');
-      ptln('<input type="hidden" name="id" value="'.$ID.'" />');
+      ptln('<div class="no"><input type="hidden" name="id" value="'.$ID.'" /></div>');
       formSecurityToken();
       $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));