diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
new file mode 100644
index 00000000000..85cce9f9407
--- /dev/null
+++ b/core/lostpassword/css/lostpassword.css
@@ -0,0 +1,36 @@
+#body-login
+input[type="text"],
+input[type="submit"] {
+	margin: 5px 0;
+}
+
+input[type="text"]#user{
+	padding-right: 12px;
+	padding-left: 41px;
+}
+
+#body-login
+input[type="submit"] {
+	text-align: center;
+	width: 170px;
+	height: 45px;
+	padding-top: 7px;
+	padding-bottom: 7px;
+}
+
+#body-login input[type="submit"]#submit {
+	width: 280px;
+}
+
+#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 f5fdb1fb2b3..83a23f7b239 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,5 +1,8 @@
-<?php if ($_['requested']): ?>
-	<div class="success"><p>
+<?php
+//load the file we need
+OCP\Util::addStyle('lostpassword', 'lostpassword');
+	if ($_['requested']): ?>
+		<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 .'));
 	?>
@@ -8,11 +11,11 @@
 	<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
 		<fieldset>
 			<?php if ($_['error']): ?>
-				<div class="errors"><p>
+				<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; ?>
-			<?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?>
+			<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>
@@ -24,7 +27,7 @@
 					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
 				<?php endif; ?>
 			</p>
-			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
+			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" />
 		</fieldset>
 	</form>
 <?php endif; ?>