diff --git a/public/js/startup.js b/public/js/startup.js
index 8cc02cb..2d3e258 100644
--- a/public/js/startup.js
+++ b/public/js/startup.js
@@ -38,6 +38,8 @@
 			erpnext.set_theme(wn.boot.profile.defaults.theme[0]);
 		}
 
+		erpnext.setup_mousetrap();
+		
 		// always allow apps
 		wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat(
 			['To Do', 'Knowledge Base', 'Calendar', 'Activity', 'Messages'])
@@ -170,16 +172,18 @@
 	}
 }
 
-Mousetrap.bind(["command+g", "ctrl+g"], function() {
-	wn.ui.toolbar.search.show();
-	return false;
-});
+erpnext.setup_mousetrap = function() {
+	Mousetrap.bind(["command+g", "ctrl+g"], function() {
+		wn.ui.toolbar.search.show();
+		return false;
+	});
 
-Mousetrap.bind(["command+s", "ctrl+s"], function() {
-	if(cur_frm)
-		cur_frm.save();
-	return false;
-});
+	Mousetrap.bind(["command+s", "ctrl+s"], function() {
+		if(cur_frm)
+			cur_frm.save();
+		return false;
+	});	
+}
 
 // start
 $(document).bind('startup', function() {
diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html
index e4040fb..7c73e6a 100644
--- a/website/templates/pages/login.html
+++ b/website/templates/pages/login.html
@@ -15,7 +15,9 @@
 {% block content %}
 	<div class="layout-wrapper layout-wrapper-appframe" id='login_wrapper'>
 	<div class="appframe-area">
-		<div class="appframe-title">Login</div>
+		<div class="appframe-titlebar">
+			<div class="appframe-title">Login</div>
+		</div>
 	</div>
 	<div class="layout-main" style="padding: 15px;">
 	<form autocomplete="on">