  'No sig'						=>	'No signature currently stored in profile.',
  'Signature quote/code/list/h'	=>	'The quote, code, list, and heading BBCodes are not allowed in signatures.',
 diff --git a/login.php b/login.php
-index 2d0aa802..f311dcf6 100644
+index 323629a6..ac2b70cf 100644
 --- a/login.php
 +++ b/login.php
-@@ -235,7 +235,7 @@ if (!empty($errors))
+@@ -237,7 +237,7 @@ if (!empty($errors))
  					<legend><?php echo $lang_login['Request pass legend'] ?></legend>
  					<div class="infldset">
  						<input type="hidden" name="form_sent" value="1" />
 -						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php if (isset($_POST['req_email'])) echo pun_htmlspecialchars($_POST['req_email']); ?>" size="50" maxlength="80" /><br /></label>
-+						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="text" name="req_email" value="<?php if (isset($_POST['req_email'])) echo pun_htmlspecialchars($_POST['req_email']); ?>" size="50" maxlength="80" required /><br /></label>
++						<label class="required"><strong><?php echo $lang_common['Email'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input id="req_email" type="email" name="req_email" value="<?php if (isset($_POST['req_email'])) echo pun_htmlspecialchars($_POST['req_email']); ?>" size="50" maxlength="80" autocomplete="email" required /><br /></label>
  						<p><?php echo $lang_login['Request pass info'] ?></p>
  					</div>
  				</fieldset>
-@@ -310,20 +310,20 @@ if (!empty($errors))
- 					<div class="infldset">
+@@ -313,20 +313,20 @@ if (!empty($errors))
  						<input type="hidden" name="form_sent" value="1" />
  						<input type="hidden" name="redirect_url" value="<?php echo pun_htmlspecialchars($redirect_url) ?>" />
+ 						<input type="hidden" name="csrf_token" value="<?php echo pun_csrf_token() ?>" />
 -						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if (isset($_POST['req_username'])) echo pun_htmlspecialchars($_POST['req_username']); ?>" size="25" maxlength="25" tabindex="1" /><br /></label>
 -						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
-+						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if (isset($_POST['req_username'])) echo pun_htmlspecialchars($_POST['req_username']); ?>" size="25" maxlength="25" autofocus required /><br /></label>
-+						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" required /><br /></label>
++						<label class="conl required"><strong><?php echo $lang_common['Username'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="text" name="req_username" value="<?php if (isset($_POST['req_username'])) echo pun_htmlspecialchars($_POST['req_username']); ?>" size="25" maxlength="25" autocomplete="username" autofocus required /><br /></label>
++						<label class="conl required"><strong><?php echo $lang_common['Password'] ?> <span><?php echo $lang_common['Required'] ?></span></strong><br /><input type="password" name="req_password" size="25" autocomplete="current-password" required /><br /></label>
  
  						<div class="rbox clearb">
 -							<label><input type="checkbox" name="save_pass" value="1"<?php if (isset($_POST['save_pass'])) echo ' checked="checked"'; ?> tabindex="3" /><?php echo $lang_login['Remember me'] ?><br /></label>

 						<label>
 							<strong><?php echo $lang_update['Current character set label'] ?></strong><br /><?php echo $lang_update['Current character set info'] ?><br />
diff --git a/edit.php b/edit.php
index d757eeb0..8ed4d1a8 100644
--- a/edit.php
+++ b/edit.php
@@ -113,7 +113,7 @@ if (isset($_POST['form_sent']))
 		$stick_topic = $cur_post['sticky'];
 
 	// Replace four-byte characters (MySQL cannot handle them)

 								</tr>
 							</table>
diff --git a/db_update.php b/db_update.php
index 2964bf31..6cefcbaf 100644
--- a/db_update.php
+++ b/db_update.php
@@ -118,7 +118,7 @@ $db->start_transaction();
 $old_connection_charset = defined('FORUM_DEFAULT_CHARSET') ? FORUM_DEFAULT_CHARSET : $db->get_names();
 
 // Set the connection to UTF-8 now
