diff --git a/core/css/styles.css b/core/css/styles.css
index 36a2e607441..ae1459af9d4 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -289,7 +289,7 @@ body {
 #body-login form {
 	position: relative;
 	width: 280px;
-	margin: 32px auto;
+	margin: 16px auto;
 	padding: 0;
 }
 #body-login form fieldset {
diff --git a/core/templates/login.php b/core/templates/login.php
index 46e78576a1f..b6b42d3b65b 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -64,6 +64,9 @@ script('core', [
 				<?php p($l->t('Wrong password.')); ?>
 			</p>
 		<?php } ?>
+
+		<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" tabindex="4" />
+
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
 		<div class="remember-login-container">
 			<?php if ($_['rememberLoginState'] === 0) { ?>
@@ -75,8 +78,6 @@ script('core', [
 		</div>
 		<?php endif; ?>
 
-		<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" tabindex="4" />
-
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 		<input type="hidden" name="timezone" id="timezone"/>
 		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>">