diff --git a/system/pages/account/lost/check-code.php b/system/pages/account/lost/check-code.php
index 3babcd16..44c3c622 100644
--- a/system/pages/account/lost/check-code.php
+++ b/system/pages/account/lost/check-code.php
@@ -5,8 +5,8 @@ csrfProtect();
 
 $title = 'Lost Account';
 
-$code = $_POST['code'] ?? '';
-$character = $_POST['character'] ?? '';
+$code = $_REQUEST['code'] ?? '';
+$character = $_REQUEST['character'] ?? '';
 
 if(empty($code) || empty($character)) {
 	$twig->display('account/lost/check-code.html.twig', [
diff --git a/system/pages/account/lost/email/step-1.php b/system/pages/account/lost/email/step-1.php
index eef9211d..d36e3b4d 100644
--- a/system/pages/account/lost/email/step-1.php
+++ b/system/pages/account/lost/email/step-1.php
@@ -7,7 +7,7 @@ csrfProtect();
 
 $title = 'Lost Account';
 
-$nick = $_POST['nick'] ?? '';
+$nick = $_REQUEST['nick'] ?? '';
 
 if($account->isLoaded()) {
 	if($account->getCustomField('email_next') < time()) {
diff --git a/system/pages/account/lost/recovery-key/step-1.php b/system/pages/account/lost/recovery-key/step-1.php
index 9ace6a35..6d55b633 100644
--- a/system/pages/account/lost/recovery-key/step-1.php
+++ b/system/pages/account/lost/recovery-key/step-1.php
@@ -5,7 +5,7 @@ csrfProtect();
 
 $title = 'Lost Account';
 
-$nick = $_POST['nick'] ?? '';
+$nick = $_REQUEST['nick'] ?? '';
 
 if($account->isLoaded()) {
 	$account_key = $account->getCustomField('key');
diff --git a/system/pages/account/lost/recovery-key/step-3.php b/system/pages/account/lost/recovery-key/step-3.php
index f58437b6..2cef67bc 100644
--- a/system/pages/account/lost/recovery-key/step-3.php
+++ b/system/pages/account/lost/recovery-key/step-3.php
@@ -64,6 +64,8 @@ if($account->isLoaded()) {
 							'newPassword' => $newPassword,
 							'newEmail' => $newEmail,
 						]);
+
+						return;
 					} else {
 						$errors[] = Validator::getLastError();
 					}
diff --git a/system/templates/account/lost/email.html.twig b/system/templates/account/lost/email.html.twig
index 3c95e22d..4f43efea 100644
--- a/system/templates/account/lost/email.html.twig
+++ b/system/templates/account/lost/email.html.twig
@@ -30,7 +30,7 @@ Please enter e-mail to account with this character.<br/>
 							<label for="name">E-mail to account:</label>
 						</td>
 						<td>
-							<input type=text id="name" name="email" value="" size="40">
+							<input type="email" id="name" name="email" value="" size="40">
 						</td>
 					</tr>
 				</table>