diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index 63ea4f1d61..b1e54dc8b7 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -257,5 +257,8 @@ frappe.ui.toolbar.show_about = function() {
 }
 
 frappe.ui.toolbar.show_banner = function(msg) {
-	return $('<div class="toolbar-banner"></div>').html(msg).appendTo($('header'));
+	$banner = $('<div class="toolbar-banner">'+msg+'<a class="close">&times;</a></div>')
+		.appendTo($('header'));
+	$banner.find(".close").click(function() { $(".toolbar-banner").toggle(false); });
+	return $banner;
 }
diff --git a/frappe/templates/includes/navbar.html b/frappe/templates/includes/navbar.html
index 9fbcec7968..a49af7a409 100644
--- a/frappe/templates/includes/navbar.html
+++ b/frappe/templates/includes/navbar.html
@@ -30,7 +30,6 @@
 					{%- endif -%}
 					{%- endfor %}
 					<!-- post login tools -->
-					{% if not disable_signup %}
 					<li class="dropdown logged-in" id="website-post-login"
 						data-label="website-post-login" style="display: none">
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -56,6 +55,7 @@
 							{%- endfor -%}
 						</ul>
 					</li>
+					{% if not disable_signup %}
 					<li class="btn-login-area"><a href="/login">Sign Up / Login</a></li>
 					{% endif %}
 				</ul>
@@ -63,4 +63,4 @@
 		</div>
 	</nav>
 </header>
-<script>$('.dropdown-toggle').dropdown()</script>
+<script>$(function() { $('.dropdown-toggle').dropdown(); });</script>