diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css
index d7d8a0ee..40ef5d55 100755
--- a/server/public/assets/css/style.css
+++ b/server/public/assets/css/style.css
@@ -2701,7 +2701,7 @@ nav ul li:hover, nav ul li.active {
     }
 
     #frontpage-viewer-counter{
-        right: 0px;
+        right: 56px;
         width: 62px;
         left: inherit;
         text-align: right;
diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js
index 0c0fe968..7f2edace 100755
--- a/server/public/assets/js/frontpage.js
+++ b/server/public/assets/js/frontpage.js
@@ -311,6 +311,7 @@ var Frontpage = {
             $("#frontpage-viewer-counter").tooltip("remove");
             $(".generate-channel-name").tooltip("remove");
             $("#offline-mode").tooltip("remove");
+            $("#client-mode-button").tooltip("remove");
         }
         currently_showing_channels = 1;
         clearTimeout(retry_frontpage);
@@ -444,6 +445,11 @@ var Frontpage = {
                 position: "bottom",
                 tooltip: "Total Viewers"
             });
+            $("#client-mode-button").tooltip({
+                delay: 5,
+                position: "bottom",
+                tooltip: "Client mode"
+            });
             $(".generate-channel-name").tooltip({
                 delay: 5,
                 position: "bottom",
diff --git a/server/public/partials/frontpage/header.handlebars b/server/public/partials/frontpage/header.handlebars
index 773dd93f..7c76d066 100644
--- a/server/public/partials/frontpage/header.handlebars
+++ b/server/public/partials/frontpage/header.handlebars
@@ -5,10 +5,15 @@
                 <img class="zicon" src="/assets/images/z.svg" alt="zoff" title="Zoff" />
             </a>
             <div id="frontpage-viewer-counter" class="noselect" title="Divided among all channels. Hidden or not"></div>
-            <ul class="right hide-on-med-and-down">
-                <li><a class="header-buttons waves-effect waves-cyan" id="offline-mode" title="Local mode" href="#">Local</a></li>
-                <li><a class="header-buttons waves-effect waves-green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li>
-                <li><a class="header-buttons modal-trigger waves-effect waves-orange" data-target="about">About</a></li>
+            <ul class="right">
+                {{#if client}}
+                    <li><a class="header-buttons waves-effect waves-orange orange" id="client-mode-button" title="Client mode" href="https://zoff.me">Client</a></li>
+                {{else}}
+                    <li><a class="header-buttons waves-effect waves-orange" id="client-mode-button" title="Client mode" href="https://client.zoff.me">Client</a></li>
+                {{/if}}
+                <li class="hide-on-small-only"><a class="header-buttons waves-effect waves-cyan" id="offline-mode" title="Local mode" href="#">Local</a></li>
+                <li class="hide-on-small-only"><a class="header-buttons waves-effect waves-green" title="Remote control a Zoff player" href="https://remote.zoff.me">Remote</a></li>
+                <li class="hide-on-small-only"><a class="header-buttons modal-trigger waves-effect waves-orange" data-target="about">About</a></li>
             </ul>
         </div>
     </nav>
diff --git a/server/routing/client/router.js b/server/routing/client/router.js
index 8f55986b..8fe42ef5 100644
--- a/server/routing/client/router.js
+++ b/server/routing/client/router.js
@@ -121,7 +121,6 @@ function root(req, res, next) {
         } else if(subdomain[0] == "www") {
             res.redirect("https://zoff.me");
         } else {
-
             var data = {
                 year: year,
                 javascript_file: "main.min.js",
@@ -131,7 +130,7 @@ function root(req, res, next) {
                 embed: false,
                 client: false
             }
-            if(subdomain == "client") {
+            if(subdomain[0] == "client") {
                 data.client = true;
             }
             res.render('layouts/client/frontpage', data);