Index: branches/1.2.x/platform/login/forgot_password.tpl
===================================================================
diff -u -N -r14727 -r15585
--- branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 14727)
+++ branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 15585)
@@ -51,22 +51,12 @@
 					<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 />
+				<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_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Username" style="width: 155px;"/>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_EmailOrUsername" style="width: 155px;" is_last="1"/>
 
-						<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-							<td class="field-name"></td>
-							<td class="field-value">
-								<inp2:m_Phrase label="lu_Or"/>
-							</td>
-						</tr>
-						<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotEmail" title="lu_fld_Email" style="width: 155px;" is_last="1"/>
-
 						<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"/>