diff --git a/install/resources/mybb_theme.xml b/install/resources/mybb_theme.xml
index 0bd56efffc..05138a7971 100644
--- a/install/resources/mybb_theme.xml
+++ b/install/resources/mybb_theme.xml
@@ -4265,7 +4265,7 @@ $(".forumjump").change(function() {
 							<input type="hidden" name="postthread" value="1" />
 						</fieldset>
 						</form>]]></template>
-		<template name="header_welcomeblock_guest" version="1804"><![CDATA[						<!-- Continuation of div(class="upper") as opened in the header template -->
+		<template name="header_welcomeblock_guest" version="1816"><![CDATA[						<!-- Continuation of div(class="upper") as opened in the header template -->
 						<span class="welcome">{$lang->welcome_guest} <a href="{$mybb->settings['bburl']}/member.php?action=login" onclick="$('#quick_login').modal({ fadeDuration: 250, keepelement: true, zIndex: (typeof modal_zindex !== 'undefined' ? modal_zindex : 9999) }); return false;" class="login">{$lang->welcome_login}</a> <a href="{$mybb->settings['bburl']}/member.php?action=register" class="register">{$lang->welcome_register}</a></span>
 					</div>
 				</div>
@@ -4278,34 +4278,38 @@ $(".forumjump").change(function() {
 							<tr>
 								<td class="thead" colspan="2"><strong>{$lang->login}</strong></td>
 							</tr>
-							<tr>
-								<td class="trow1" width="25%"><strong>{$login_username}</strong></td>
-								<td class="trow1"><input name="quick_username" id="quick_login_username" type="text" value="" class="textbox initial_focus" /></td>
-							</tr>
-							<tr>
-								<td class="trow2"><strong>{$lang->password}</strong></td>
-								<td class="trow2">
-									<input name="quick_password" id="quick_login_password" type="password" value="" class="textbox" /> <a href="{$mybb->settings['bburl']}/member.php?action=lostpw" class="lost_password">{$lang->lost_password}</a>
-								</td>
-							</tr>
-							<tr>
-								<td class="trow1">&nbsp;</td>
-								<td class="trow1 remember_me">
-									<input name="quick_remember" id="quick_login_remember" type="checkbox" value="yes" class="checkbox" checked="checked" />
-									<label for="quick_login_remember">{$lang->remember_me}</label>
-								</td>
-							</tr>
-							<tr>
-								<td class="trow2" colspan="2">
-									<div align="center"><input name="submit" type="submit" class="button" value="{$lang->login}" /></div>
-								</td>
-							</tr>
+							{$loginform}
 						</table>
 					</form>
 				</div>
 				<script type="text/javascript">
 					$("#quick_login input[name='url']").val($(location).attr('href'));
 				</script>]]></template>
+		<template name="header_welcomeblock_guest_login_modal" version="1816"><![CDATA[<tr>
+	<td class="trow1" width="25%"><strong>{$login_username}</strong></td>
+	<td class="trow1"><input name="quick_username" id="quick_login_username" type="text" value="" class="textbox initial_focus" /></td>
+</tr>
+<tr>
+	<td class="trow2"><strong>{$lang->password}</strong></td>
+	<td class="trow2">
+		<input name="quick_password" id="quick_login_password" type="password" value="" class="textbox" /> <a href="{$mybb->settings['bburl']}/member.php?action=lostpw" class="lost_password">{$lang->lost_password}</a>
+	</td>
+</tr>
+<tr>
+	<td class="trow1">&nbsp;</td>
+	<td class="trow1 remember_me">
+		<input name="quick_remember" id="quick_login_remember" type="checkbox" value="yes" class="checkbox" checked="checked" />
+		<label for="quick_login_remember">{$lang->remember_me}</label>
+	</td>
+</tr>
+<tr>
+	<td class="trow2" colspan="2">
+		<div align="center"><input name="submit" type="submit" class="button" value="{$lang->login}" /></div>
+	</td>
+</tr>]]></template>
+		<template name="header_welcomeblock_guest_login_modal_lockout" version="1816"><![CDATA[<tr>
+	<td class="trow1" colspan="2">{$lang->failed_login_wait}</td>
+</tr>]]></template>
 		<template name="header_welcomeblock_member" version="1809"><![CDATA[<!-- Continuation of div(class="upper") as opened in the header template -->
 	<span class="welcome">{$lang->welcome_back} <a href="{$mybb->settings['bburl']}/member.php?action=logout&amp;logoutkey={$mybb->user['logoutkey']}" class="logout">{$lang->welcome_logout}</a></span>
 	</div>