diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index 15061a6424..b577647aa6 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -58,7 +58,7 @@
 			$('#search-button').show();
 
 			var userLabel = loggedInMenu.find('#user_label');
-			
+
 			if (userLabel.length) {
 				if (data['userslug'])
 					userLabel.find('#user-profile-link').attr('href', '/user/' + data['userslug']);
@@ -88,7 +88,7 @@
 
 		}
 
-		$('#main-nav a,#user-control-list a').off('click').on('click', function() {
+		$('#main-nav a,#user-control-list a,#logged-out-menu .dropdown-menu a').off('click').on('click', function() {
 			if($('.navbar .navbar-collapse').hasClass('in'))
 				$('.navbar-header button').click();
 		});
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 08c06d44db..100d2d71df 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -116,11 +116,16 @@
 				</ul>
 
 				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
-					<li id="register-link">
-						<a href="/register">Register</a>
-					</li>
-					<li id="login-link">
-						<a href="/login">Login</a>
+					<li>
+						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="icon-signin"></i></a>
+						<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
+							<li>
+								<a href="/register">Register</a>
+							</li>
+							<li>
+								<a href="/login">Login</a>
+							</li>
+						</ul>
 					</li>
 				</ul>