diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 9cc569a62d1d4b961ec65e2b54b9bacb8e37b2fd..d27f64ff4bd247739679073e5fc3aba7af431bcd 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -68,7 +68,9 @@
                     <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
                     <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
                     <!-- end: skip link navigation -->
+			        <tmpl_if name="cpuser">
                     <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+			        </tmpl_if>
                 </div>
                 <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index 628284e1019db775437aa7c77ba882c7583e4dcb..20923820e5864dea38e216ff3831a9ab0f415aaf 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -69,7 +69,9 @@
                     <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
                     <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
                     <!-- end: skip link navigation -->
+			        <tmpl_if name="cpuser">
                     <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+			        </tmpl_if>
                 </div>
                 <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index e4f121efdd1f8fa2948976b4ad1d4c60a14472d2..6bcf70d53d312933c818cd614cdb5f5aab8a401c 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -69,7 +69,9 @@
                     <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
                     <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
                     <!-- end: skip link navigation -->
+			        <tmpl_if name="cpuser">
                     <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+			        </tmpl_if>
                 </div>
                 <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>