Index: platform/elements/forms.elm.tpl
===================================================================
--- platform/elements/forms.elm.tpl	(revision 14446)
+++ platform/elements/forms.elm.tpl	(working copy)
@@ -170,7 +170,7 @@
 			<inp2:m_if check="{$prefix}_HasError" field="$field">
 				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
 			</inp2:m_if>
-			<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
+			<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field name='{$field}_plain'/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
 			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 	</tr>
Index: platform/login/forgot_password_reset.tpl
===================================================================
--- platform/login/forgot_password_reset.tpl	(revision 14446)
+++ platform/login/forgot_password_reset.tpl	(working copy)
@@ -48,12 +48,17 @@
 
 				<inp2:m_if check="u_TestCodeIsValid">
 					<form method="POST" action="<inp2:m_FormAction />">
-						<input type="submit" name="events[u][OnResetPasswordConfirmed]" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" class="button" />
+						<table class="form-data fullwidth">
+							<inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="Password" title="lu_fld_Password" style="width:155px" />
+							<inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" is_last="1"/>
 
-						<input type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" />
+							<inp2:m_RenderElement design="inp_edit_buttons">
+								<input class="button" type="submit" name="events[u.forgot][OnResetLostPassword]" value="<inp2:m_Phrase label='lu_btn_Update' no_editing='1'/>"/>
+								<input type="hidden" name="next_template" value="platform/login/forgot_password_reset_confirm"/>
+							</inp2:m_RenderElement>
+						</table>
 
-						<input type="hidden" name="user_key" value="<inp2:m_Get name="user_key"/>"/>
-						<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_confirm" />
+						<input type="hidden" name="user_key" value="<inp2:m_Get name='user_key'/>"/>
 					</form>
 				<inp2:m_else />
 					<span class="error"><inp2:u_Error field="PwResetConfirm"/></span>