diff --git a/core/css/styles.css b/core/css/styles.css
index 4dfa3f64a375c70a5ea3f9e8b524b229e5a25c45..6eea2be433de525bad1422ab8222b2c2d057174f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -220,6 +220,8 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 #login #databaseField .infield { padding-left:0; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
+#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
+#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
 
 /* Show password toggle */
 #show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index dc9f0bc8ad380b891df236caf3ffc8830ebd6fca..c19c6893f13fe69d61c2b4aa7a7fa808044831bd 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,17 +1,24 @@
-<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
-	<fieldset>
-		<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
-		<?php if ($_['requested']): ?>
-			<?php echo $l->t('Reset email send.'); ?>
-		<?php else: ?>
+<?php if ($_['requested']): ?>
+	<div class="success"><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 .'));
+	?>
+	</p></div>
+<?php else: ?>
+	<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
+		<fieldset>
 			<?php if ($_['error']): ?>
-				<?php echo $l->t('Request failed!'); ?>
+				<div class="errors"><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.')); ?>
 			<p class="infield">
-				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 				<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>
+				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 			</p>
-			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
-		<?php endif; ?>
-	</fieldset>
-</form>
+			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
+		</fieldset>
+	</form>
+<?php endif; ?>