diff --git a/core/templates/login.php b/core/templates/login.php
index 85db3bc9a52..717f6bcabda 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,17 +1,17 @@
 <form action="index.php" method="post">
 	<fieldset>
 		<?php if($_['error']): ?>
-			<?php echo $l->t( 'Login failed!' ); ?>
+			<a href="index.php?lostpassword"><?php echo $l->t('Lost your password?'); ?></a>
+		<?php endif; ?>
+		<?php if(empty($_["username"])): ?>
+			<input type="text" name="user" id="user" placeholder="Username" value="" autocomplete="off" required autofocus />
+			<input type="password" name="password" id="password" placeholder="Password" value="" required />
+			<input type="checkbox" name="remember_login" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
+		<?php else: ?>
+		      <input type="text" name="user" id="user" placeholder="Username" value="<?php echo $_['username']; ?>" autocomplete="off" required >
+		      <input type="password" name="password" id="password" placeholder="Password" value="" required autofocus />
+		      <input type="checkbox" name="remember_login" id="remember_login" checked /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
 		<?php endif; ?>
-		<?php if(empty($_["username"])){?>
-		<input type="text" name="user" id="user" placeholder="Username" value="" autocomplete="off" required autofocus />
-		<input type="password" name="password" id="password" placeholder="Password" value="" required />
-		<input type="checkbox" name="remember_login" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
-		<?php }else{ ?>
-		<input type="text" name="user" id="user" placeholder="Username" value="<?php echo $_['username']; ?>" autocomplete="off" required >
-		<input type="password" name="password" id="password" placeholder="Password" value="" required autofocus />
-		<input type="checkbox" name="remember_login" id="remember_login" checked /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
-		<?php } ?>
 		<input type="submit" id="submit" value="Log in" />
 	</fieldset>
 </form>
diff --git a/core/templates/lostpassword.php b/core/templates/lostpassword.php
index 212ca8d2edb..67e34164d08 100644
--- a/core/templates/lostpassword.php
+++ b/core/templates/lostpassword.php
@@ -2,11 +2,10 @@
 	<fieldset>
 		<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
 		<?php if ($_['requested']): ?>
-			<?php echo $l->t( 'Requested' ); ?>
-			
+			<?php echo $l->t('Requested'); ?>
 		<?php else: ?>
 			<?php if ($_['error']): ?>
-				<?php echo $l->t( 'Login failed!' ); ?>
+				<?php echo $l->t('Login failed!'); ?>
 			<?php endif; ?>
 			<input type="text" name="user" id="user" placeholder="<?php echo $l->t('Username or Email'); ?>" value="" autocomplete="off" required autofocus />
 			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
diff --git a/core/templates/resetpassword.php b/core/templates/resetpassword.php
index 3c7c46efe13..47d0e69b7d3 100644
--- a/core/templates/resetpassword.php
+++ b/core/templates/resetpassword.php
@@ -1,4 +1,4 @@
-<form action="<?php echo "index.php?".$_SERVER['QUERY_STRING'] ?>" method="post">
+<form action="<?php echo "index.php?".$_SERVER['QUERY_STRING']; ?>" method="post">
 	<fieldset>
 		<?php if($_['success']): ?>
 			<?php echo $l->t('Your password was successfully reset'); ?>