Index: branches/1.1.x/platform/login/forgot_password.tpl
===================================================================
diff -u -N -r14273 -r14488
--- branches/1.1.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 14273)
+++ branches/1.1.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 14488)
@@ -49,25 +49,16 @@
 				</inp2:m_if>
 				<br /><br />
 
-				<inp2:m_if check="u_HasError" field="any">
+				<inp2:m_if check="u.forgot_HasError" field="any">
 					<inp2:m_RenderElement name="error_message"/>
 				</inp2:m_if>
 
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
-						<inp2:m_if check="m_ConfigEquals" name="Email_As_Login" value="0">
-							<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-								<inp2:m_RenderElement name="inp_edit_field_caption" prefix="u" field="Login" title="lu_fld_Login"/>
-								<td class="field-value">
-									<inp2:m_if check="u_HasError" field="Login">
-										<span class="field-error"><inp2:u_Error field="Login"/></span><br />
-									</inp2:m_if>
-									<input type="text" class="input-text" name="username" value="<inp2:m_Get name="username"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 155px;">
-								</td>
-							</tr>
-							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+						<inp2:m_if check="u_UseUsernames">
+							<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Login" style="width: 155px;"/>
 
 							<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 								<td class="field-name"></td>
@@ -78,21 +69,13 @@
 							<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
 						</inp2:m_if>
 
-						<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="u" field="Email" title="lu_fld_Email"/>
-							<td class="field-value">
-								<inp2:m_if check="u_HasError" field="Email">
-									<span class="field-error"><inp2:u_Error field="Email"/></span><br />
-								</inp2:m_if>
-								<input type="text" class="input-text" name="email" value="<inp2:m_Get name="email"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 155px;">
-							</td>
-						</tr>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotEmail" title="lu_fld_Email" style="width: 155px;"/>
 
 						<inp2:m_RenderElement design="inp_edit_buttons">
 							<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
 							<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
 
-							<input type="submit" class="button" name="events[u][OnForgotPassword]" value="<inp2:m_Phrase label="lu_btn_SendPassword" no_editing="1"/>" />
+							<input type="submit" class="button" name="events[u.forgot][OnForgotPassword]" value="<inp2:m_Phrase label='lu_btn_SendPassword' no_editing='1'/>" />
 							<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
 						</inp2:m_RenderElement>
 					</table>