diff --git a/admin/custom_fields.php b/admin/custom_fields.php
index 5ab6c61e..f5154064 100755
--- a/admin/custom_fields.php
+++ b/admin/custom_fields.php
@@ -113,7 +113,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 						<a title="<?php echo $hesklang['tab_4']; ?>" href="custom_fields.php">
 							<?php echo $hesklang['tab_4']; ?>
 							<i class="fa fa-question-circle settingsquestionmark"
-							   onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['cf_intro']); ?>')"></i>
+							   onclick="alert('<?php echo hesk_makeJsString($hesklang['cf_intro']); ?>')"></i>
 						</a>
 					</li>
 				</ul>
diff --git a/admin/manage_email_templates.php b/admin/manage_email_templates.php
index e282d05b..8b487e29 100644
--- a/admin/manage_email_templates.php
+++ b/admin/manage_email_templates.php
@@ -103,6 +103,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             </li>
             ';
                     }
+
+                    if (hesk_checkPermission('can_man_settings', 0)) {
+                        echo '
+                    <li role="presentation">
+						<a title="' . $hesklang['tab_4'] . '" href="custom_fields.php">' .
+                            $hesklang['tab_4']
+                            . '</a>
+					</li>
+                        ';
+                    }
                     ?>
                 </ul>
                 <div class="tab-content summaryList tabPadding">
diff --git a/admin/manage_statuses.php b/admin/manage_statuses.php
index 96138f76..1b24074d 100644
--- a/admin/manage_statuses.php
+++ b/admin/manage_statuses.php
@@ -87,6 +87,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                                             title="<?php echo $hesklang['statuses']; ?>"
                                                                             data-content="<?php echo $hesklang['statuses_intro']; ?>"></i></a>
                     </li>
+                    <?php
+                    if (hesk_checkPermission('can_man_settings', 0)) {
+                        echo '
+                    <li role="presentation">
+						<a title="' . $hesklang['tab_4'] . '" href="custom_fields.php">' .
+							$hesklang['tab_4']
+						. '</a>
+					</li>
+                        ';
+                    }
+                    ?>
                 </ul>
                 <div class="tab-content summaryList tabPadding">
                     <div class="row">