diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index d3ff094b45..d8d9c39743 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -72,9 +72,11 @@
 					<li>
 						<a href="{relative_path}/users"><i class="fa fa-fw fa-users" title="[[global:header.users]]"></i><span class="visible-xs-inline"> [[global:header.users]]</span></a>
 					</li>
-					<li class="{adminDisplay}">
+					<!-- IF isAdmin -->
+					<li>
 						<a href="{relative_path}/admin"><i class="fa fa-fw fa-cogs" title="[[global:header.admin]]"></i><span class="visible-xs-inline"> [[global:header.admin]]</span></a>
 					</li>
+					<!-- ENDIF isAdmin -->
 
 					<li class="visible-xs">
 						<a id="mobile-search-button" href="{relative_path}/search"><i class="fa fa-search" title="[[global:header.search]]"></i> [[global:header.search]]</a>
diff --git a/src/webserver.js b/src/webserver.js
index 13946b6044..8e1381c4ef 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -154,7 +154,7 @@ module.exports.server = server;
 			}
 
 			user.isAdministrator(uid, function(err, isAdmin) {
-				templateValues.adminDisplay = isAdmin ? 'show' : 'hide';
+				templateValues.isAdmin = isAdmin;
 
 				translator.translate(templates.header.parse(templateValues), function(template) {
 					callback(null, template);