diff --git a/data/web/inc/relay_check.php b/data/web/inc/ajax/relay_check.php
similarity index 100%
rename from data/web/inc/relay_check.php
rename to data/web/inc/ajax/relay_check.php
diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php
index d6d29c59..cedd07ca 100644
--- a/data/web/inc/header.inc.php
+++ b/data/web/inc/header.inc.php
@@ -78,11 +78,6 @@
                 <li<?= (preg_match("/mailbox/i", $_SERVER['REQUEST_URI'])) ? ' class="active"' : ''; ?>><a href="/mailbox.php"><?= $lang['header']['mailboxes']; ?></a></li>
               <?php
               }
-              if ($_SESSION['mailcow_cc_role'] == 'admin') {
-              ?>
-                <li<?= (preg_match("/diagnostics/i", $_SERVER['REQUEST_URI'])) ? ' class="active"' : ''; ?>><a href="/diagnostics.php"><?= $lang['header']['diagnostics']; ?></a></li>
-              <?php
-              }
               if ($_SESSION['mailcow_cc_role'] != 'admin') {
               ?>
                 <li<?= (preg_match("/user/i", $_SERVER['REQUEST_URI'])) ? ' class="active"' : ''; ?>><a href="/user.php"><?= $lang['header']['user_settings']; ?></a></li>
diff --git a/data/web/js/admin.js b/data/web/js/admin.js
index c368cbe7..997e76a3 100644
--- a/data/web/js/admin.js
+++ b/data/web/js/admin.js
@@ -466,7 +466,7 @@ jQuery(function($){
     $(this).html('<span class="glyphicon glyphicon-refresh glyphicon-spin"></span> ');
     $.ajax({
         type: 'GET',
-        url: 'inc/relay_check.php',
+        url: 'inc/ajax/relay_check.php',
         dataType: 'text',
         data: $('#test_relayhost_form').serialize(),
         complete: function (data) {
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index 149a59d3..30c3ecdb 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -39,12 +39,16 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
                 <a class="btn btn-sm btn-default" id="toggle_multi_select_all" data-id="domain" href="#"><span class="glyphicon glyphicon-check" aria-hidden="true"></span> <?=$lang['mailbox']['toggle_all'];?></a>
                 <a class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" href="#"><?=$lang['mailbox']['quick_actions'];?> <span class="caret"></span></a>
                 <ul class="dropdown-menu">
-                  <li><a id="edit_selected" data-id="domain" data-api-url='edit/domain' data-api-attr='{"active":"1"}' href="#"><?=$lang['mailbox']['activate'];?></a></li>
-                  <li><a id="edit_selected" data-id="domain" data-api-url='edit/domain' data-api-attr='{"active":"0"}' href="#"><?=$lang['mailbox']['deactivate'];?></a></li>
-                  <li role="separator" class="divider"></li>
-                  <li><a id="delete_selected" data-id="domain" data-api-url='delete/domain' href="#"><?=$lang['mailbox']['remove'];?></a></li>
+                  <? if($_SESSION['mailcow_cc_role'] == "admin"): ?>
+                    <li><a id="edit_selected" data-id="domain" data-api-url='edit/domain' data-api-attr='{"active":"1"}' href="#"><?=$lang['mailbox']['activate'];?></a></li>
+                    <li><a id="edit_selected" data-id="domain" data-api-url='edit/domain' data-api-attr='{"active":"0"}' href="#"><?=$lang['mailbox']['deactivate'];?></a></li>
+                    <li role="separator" class="divider"></li>
+                    <li><a id="delete_selected" data-id="domain" data-api-url='delete/domain' href="#"><?=$lang['mailbox']['remove'];?></a></li>
+                  <? endif; ?>
                 </ul>
-                <a class="btn btn-sm btn-success" href="#" data-toggle="modal" data-target="#addDomainModal"><span class="glyphicon glyphicon-plus"></span> <?=$lang['mailbox']['add_domain'];?></a>
+                <? if($_SESSION['mailcow_cc_role'] == "admin"): ?>
+                  <a class="btn btn-sm btn-success" href="#" data-toggle="modal" data-target="#addDomainModal"><span class="glyphicon glyphicon-plus"></span> <?=$lang['mailbox']['add_domain'];?></a>
+                <? endif; ?>
               </div>
             </div>
           </div>