diff --git a/core/css/styles.css b/core/css/styles.css
index bc4db43301..1a4a4ab4f3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -508,7 +508,7 @@ input[type="submit"].enabled {
 #body-login #submit.login {
 	position: absolute;
 	right: 0;
-	top: 49px;
+	top: 0;
 	border: none;
 	background-color: transparent;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
@@ -527,8 +527,8 @@ input[type="submit"].enabled {
 
 #body-login form {
 	position: relative;
-	width: 22em;
-	margin: 2em auto 2em;
+	width: 280px;
+	margin: 32px auto;
 	padding: 0;
 }
 #body-login form fieldset {
diff --git a/core/templates/login.php b/core/templates/login.php
index 08c7768a43..2057b1034d 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -55,10 +55,9 @@ script('core', [
 				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
+			<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
 		</p>
 
-		<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
-
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
 		<a id="lost-password" class="warning" href="">
 			<?php p($l->t('Wrong password. Reset it?')); ?>