diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 3718bd052..9dcc30235 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -3082,13 +3082,14 @@ a.link-social:hover { text-decoration: none; }
 
 #login-panel { margin: 0 auto; width: 420px; }
 #login-panel .panel, #login-panel #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #login-panel .notifs_panel, #login-panel .bootstrap #dash_version, .bootstrap #login-panel #dash_version { -webkit-box-shadow: rgba(255, 255, 255, 0.45) 0 0 0 6px; box-shadow: rgba(255, 255, 255, 0.45) 0 0 0 6px; }
-#login-panel .panel-footer, #login-panel #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer, #header_notifs_icon_wrapper .notifs_panel #login-panel .notifs_panel_footer { margin: 0 -20px -20px; }
+#login-panel .panel-footer, #login-panel #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer, #header_notifs_icon_wrapper .notifs_panel #login-panel .notifs_panel_footer { height: inherit; margin: 0 -20px -20px; }
 #login-panel .flip-container { -webkit-perspective: 1000px; -moz-perspective: 1000px; perspective: 1000px; height: 370px; }
 #login-panel .flip-container.flip .flipper { -webkit-transform: rotateY(180deg); -ms-transform: rotateY(180deg); transform: rotateY(180deg); }
 #login-panel .flipper { -webkit-transition-duration: 0.6s; transition-duration: 0.6s; -webkit-transform-style: preserve-3d; -moz-transform-style: preserve-3d; -ms-transform-style: preserve-3d; -o-transform-style: preserve-3d; transform-style: preserve-3d; position: relative; }
 #login-panel .front, #login-panel .back { -webkit-backface-visibility: hidden; -moz-backface-visibility: hidden; backface-visibility: hidden; width: 420px; padding: 20px; position: absolute; top: 0; left: 0; }
 #login-panel .front { z-index: 2; }
 #login-panel .back { -webkit-transform: rotateY(180deg); -ms-transform: rotateY(180deg); transform: rotateY(180deg); }
+#login-panel #remind-me { margin-top: 0; }
 
 #login-footer a { color: #a0aab5; }
 
diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-login.sass b/admin-dev/themes/default/scss/admin-theme/_admin-login.sass
index 5e16b0d2d..22e0ed711 100644
--- a/admin-dev/themes/default/scss/admin-theme/_admin-login.sass
+++ b/admin-dev/themes/default/scss/admin-theme/_admin-login.sass
@@ -16,19 +16,17 @@
 	.panel
 		@include box-shadow(rgba(white,0.45) 0 0 0 6px)
 	.panel-footer
+		height: inherit
 		margin: 0 -20px -20px
-
 	.flip-container
 		@include perspective(1000px)
 		height: 370px
 		&.flip .flipper
 			@include rotateY(180deg)
-
 	.flipper
 		@include transition-duration(0.6s)
 		@include transform-style
 		position: relative
-
 	.front, .back
 		@include backface-visibility(hidden)
 		width: 420px
@@ -36,12 +34,12 @@
 		position: absolute
 		top: 0
 		left: 0
-
 	.front
 		z-index: 2
-
 	.back
 		@include rotateY(180deg)
+	#remind-me
+		margin-top: 0
 
 #login-footer
 	a
diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
index 4e895d432..19608a75c 100755
--- a/admin-dev/themes/default/template/controllers/login/content.tpl
+++ b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -78,9 +78,6 @@
 							</div>
 						</div>
 						<div class="form-group">
-								<a href="#" class="show-forgot-password pull-right" >
-									{l s='Lost password'}
-								</a>
 							<label class="control-label" for="passwd">
 								{l s='Password'}
 							</label>
@@ -96,15 +93,17 @@
 									placeholder="{l s='Password'}" />
 							</div>
 						</div>
-						<div class="form-group">
-							<div class="checkbox">
+						<div class="form-group clearfix">
+							<div id="remind-me" class="checkbox pull-left">
 								<label for="stay_logged_in">
 									<input name="stay_logged_in" type="checkbox" id="stay_logged_in" value="1"	tabindex="3"/>
 									{l s='Keep me logged in'}
 								</label>
 							</div>
+							<a href="#" class="show-forgot-password pull-right" >
+								{l s='Lost password'}
+							</a>
 						</div>
-						<hr/>
 						<div class="panel-footer">
 							<button name="submitLogin" type="submit" tabindex="4" class="btn btn-default btn-lg btn-block ladda-button" data-style="slide-up" data-spinner-color="black" >
 								<span class="ladda-label">