diff --git a/data/web/css/build/008-mailcow.css b/data/web/css/build/008-mailcow.css
index 4c360219..23d76089 100644
--- a/data/web/css/build/008-mailcow.css
+++ b/data/web/css/build/008-mailcow.css
@@ -177,4 +177,8 @@ nav .glyphicon {
   margin-top: 100px;
   margin-bottom: 20px;
   color: #959595;
-}
\ No newline at end of file
+}
+.slave-info {
+  padding: 15px 0px 15px 15px;
+  font-weight: bold;
+}
diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php
index 348ed372..4f58833b 100644
--- a/data/web/inc/header.inc.php
+++ b/data/web/inc/header.inc.php
@@ -147,6 +147,11 @@
             <li class="logged-in-as"><a href="#" onclick="logout.submit()"><b class="username-lia"><?= htmlspecialchars($_SESSION['mailcow_cc_username']); ?> <span class="text-info">(<?= htmlspecialchars($_SESSION['dual-login']['username']); ?>)</span> </b><span class="glyphicon glyphicon-log-out"></span></a></li>
           <?php
           endif;
+          if (!preg_match('/y|yes/i', getenv('MASTER'))):
+          ?>
+            <li class="text-warning slave-info">[ slave ]</li>
+          <?php
+          endif;
           ?>
         </ul>
       </div><!--/.nav-collapse -->
diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php
index 39c8c62a..b61679a9 100644
--- a/data/web/inc/prerequisites.inc.php
+++ b/data/web/inc/prerequisites.inc.php
@@ -1,10 +1,10 @@
 <?php
 
 // Slave does not serve UI
-if (!preg_match('/y|yes/i', getenv('MASTER'))) {
+/* if (!preg_match('/y|yes/i', getenv('MASTER'))) {
   header('Location: /SOGo', true, 307);
   exit;
-}
+}*/
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
 $default_autodiscover_config = $autodiscover_config;