diff --git a/public/language/en/global.json b/public/language/en/global.json
index c0a97b3c75..f1615549d3 100644
--- a/public/language/en/global.json
+++ b/public/language/en/global.json
@@ -9,6 +9,7 @@
 	"logout": "Logout",
 	"logout.title": "You are now logged out.",
 	"logout.message": "You have successfully logged out of NodeBB",
+	"header.admin": "Admin",
 	"header.recent": "Recent",
 	"header.unread": "Unread",
 	"header.users": "Users",
diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 01b438b7b0..e18881edfe 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -23,7 +23,8 @@ var ajaxify = {};
 
 	window.onpopstate = function (event) {
 		// "quiet": If set to true, will not call pushState
-		if (event !== null && event.state && event.state.url !== undefined) ajaxify.go(event.state.url, null, null, true);
+		if (event !== null && event.state && event.state.url !== undefined)
+			ajaxify.go(event.state.url, null, null, true);
 	};
 
 	var pagination;
@@ -123,7 +124,7 @@ var ajaxify = {};
 			if (this.getAttribute('data-ajaxify') == 'false') {
 				return;
 			}
-			
+
 			if (!e.ctrlKey && e.which === 1) {
 				if (this.host === window.location.host) {
 					// Internal link
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index adceb8c17c..08619acdbd 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -59,6 +59,10 @@
 					<li>
 						<a href="/users">[[global:header.users]]</a>
 					</li>
+					<li class="{adminDisplay}">
+
+						<a href="/admin"><i class="icon-cogs"></i> [[global:header.admin]]</a>
+					</li>
 					<li class="visible-xs">
 						<a href="/search">[[global:header.search]]</a>
 					</li>
diff --git a/src/webserver.js b/src/webserver.js
index bf038bc34e..c4502787f0 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -85,9 +85,20 @@ var express = require('express'),
 					navigation: custom_header.navigation
 				};
 
-			translator.translate(templates.header.parse(templateValues), function(template) {
-				callback(null, template);
-			});
+			var uid = '0';
+
+			if(options.req.user && options.req.user.uid)
+				uid = options.req.user.uid;
+
+			user.isAdministrator(uid, function(isAdmin) {
+				templateValues.adminDisplay = isAdmin ? 'show' : 'hide';
+
+				translator.translate(templates.header.parse(templateValues), function(template) {
+					callback(null, template);
+				});
+			})
+
+
 		});
 	};