diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
index bcb2d8569892fd1f8da6b23237c1240808e1b03e..85cce9f940790e1b4209a30e20bee763251bafe0 100644
--- a/core/lostpassword/css/lostpassword.css
+++ b/core/lostpassword/css/lostpassword.css
@@ -1,11 +1,12 @@
 #body-login
 input[type="text"],
 input[type="submit"] {
-	margin-left: 0;
+	margin: 5px 0;
 }
 
-input[type="text"] {
-	padding-right: 19px;
+input[type="text"]#user{
+	padding-right: 12px;
+	padding-left: 41px;
 }
 
 #body-login
@@ -17,10 +18,19 @@ input[type="submit"] {
 	padding-bottom: 7px;
 }
 
-fieldset {
-	margin-left: 2px;
+#body-login input[type="submit"]#submit {
+	width: 280px;
 }
 
-.white {
-	color: white;
+#body-login .update {
+	text-align: left;
+}
+
+#body-login .update,
+#body-login .error {
+	margin: 10px 0 5px 0;
+}
+
+#user {
+	width: 226px !important;
 }
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index bfc9f23008b7a41418a8b3bb631d0cd03122a889..83a23f7b23931dd5bf5a277eb59c2918422a6add 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -2,7 +2,7 @@
 //load the file we need
 OCP\Util::addStyle('lostpassword', 'lostpassword');
 	if ($_['requested']): ?>
-		<div class="success"><p>
+		<div class="update"><p>
 	<?php
 		print_unescaped($l->t('The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator .'));
 	?>
@@ -11,11 +11,11 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');
 	<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
 		<fieldset>
 			<?php if ($_['error']): ?>
-				<div class="errors"><p align="center">
+				<div class="error"><p>
 				<?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
 				</p></div>
 			<?php endif; ?>
-			<div class="white"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div>
+			<div class="update"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div>
 			<p class="infield">
 				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
 				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>