Index: branches/1.2.x/platform/login/forgot_password.tpl
===================================================================
diff -u -N -r14720 -r14727
--- branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 14720)
+++ branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 14727)
@@ -42,11 +42,7 @@
 					<inp2:m_phrase name="lu_title_ForgotPassword"/>
 				</inp2:m_Capture>
 
-				<inp2:m_if check="u_UseUsernames">
-					<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
-				<inp2:m_else/>
-					<inp2:m_Phrase label="lu_EnterForgotEmail"/>
-				</inp2:m_if>
+				<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
 				<br /><br />
 
 				<inp2:u.forgot_FormName name="forgot_password"/>
@@ -59,19 +55,17 @@
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
-						<inp2:m_if check="u_UseUsernames">
-							<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_Username" style="width: 155px;"/>
 
-							<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_if>
+						<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;"/>
+						<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"/>