diff --git a/core/css/guest.css b/core/css/guest.css
index 4256c66302..ecc3da9d08 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -93,7 +93,7 @@ body {
 form {
 	position: relative;
 	width: 280px;
-	margin: 16px auto;
+	margin: auto;
 	padding: 0;
 }
 form fieldset {
@@ -410,7 +410,6 @@ form .warning input[type='checkbox']+label {
 	padding: 12px;
 	margin-top: -6px;
 	color: #fff;
-	opacity: .7;
 }
 #forgot-password {
 	padding: 11px;
@@ -579,8 +578,7 @@ fieldset.update legend + p {
 	margin-bottom: 15px;
 }
 p.info {
-	margin: 0 auto;
-	padding-top: 20px;
+	margin: 20px auto;
 	text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
 	-webkit-user-select: none;
 	-moz-user-select: none;
diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index b44962f552..8c77004744 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -50,6 +50,7 @@ OC.Lostpassword = {
 		event.preventDefault();
 
 		$('#lost-password').hide();
+		$('.wrongPasswordMsg').hide();
 		$('#lost-password-back').slideDown().fadeIn();
 		$('.remember-login-container').slideUp().fadeOut();
 		$('#submit-wrapper').slideUp().fadeOut();
diff --git a/core/templates/login.php b/core/templates/login.php
index d28c92e36e..de991e08d9 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -51,17 +51,17 @@ script('core', 'merged-login');
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 		</p>
 
-		<?php if (!empty($_['invalidpassword'])) { ?>
-			<p class="warning">
-				<?php p($l->t('Wrong password.')); ?>
-			</p>
-		<?php } ?>
-
 		<div id="submit-wrapper">
 			<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
 			<div class="submit-icon icon-confirm-white"></div>
 		</div>
 
+		<?php if (!empty($_['invalidpassword'])) { ?>
+			<p class="warning wrongPasswordMsg">
+				<?php p($l->t('Wrong password.')); ?>
+			</p>
+		<?php } ?>
+
 		<?php if (!empty($_['canResetPassword'])) { ?>
 		<div id="reset-password-wrapper" style="display: none;">
 			<input type="submit" id="reset-password-submit" class="login primary" title="" value="<?php p($l->t('Reset password')); ?>" disabled="disabled" />
diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php
index 560dd83f30..1496e3030c 100644
--- a/tests/acceptance/features/bootstrap/LoginPageContext.php
+++ b/tests/acceptance/features/bootstrap/LoginPageContext.php
@@ -66,7 +66,7 @@ class LoginPageContext implements Context, ActorAwareInterface {
 	 * @return Locator
 	 */
 	public static function wrongPasswordMessage() {
-		return Locator::forThe()->xpath("//*[@class = 'warning' and normalize-space() = 'Wrong password.']")->
+		return Locator::forThe()->xpath("//*[@class = 'warning wrongPasswordMsg' and normalize-space() = 'Wrong password.']")->
 				describedAs("Wrong password message in Login page");
 	}