Index: branches/1.2.x/platform/my_account/my_profile.tpl
===================================================================
diff -u -N -r14274 -r14470
--- branches/1.2.x/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 14274)
+++ branches/1.2.x/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 14470)
@@ -48,7 +48,11 @@
 
 				<form method="post" enctype="multipart/form-data" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
-						<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="lu_fld_Login"/>
+						<inp2:m_if check="u_Field" name="OldStyleLogin" db="db">
+							<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px"/>
+						<inp2:m_else/>
+							<inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="lu_fld_Login"/>
+						</inp2:m_if>
 
 						<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
 						<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
Index: branches/1.2.x/platform/login/forgot_password.tpl
===================================================================
diff -u -N -r14274 -r14470
--- branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 14274)
+++ branches/1.2.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 14470)
@@ -42,10 +42,10 @@
 					<inp2:m_phrase name="lu_title_ForgotPassword"/>
 				</inp2:m_Capture>
 
-				<inp2:m_if check="conf_ConfigValue" name="Email_As_Login">
-					<inp2:m_Phrase label="lu_EnterForgotEmail"/>
-				<inp2:m_else/>
+				<inp2:m_if check="u_UseUsernames">
 					<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
+				<inp2:m_else/>
+					<inp2:m_Phrase label="lu_EnterForgotEmail"/>
 				</inp2:m_if>
 				<br /><br />
 
@@ -57,7 +57,7 @@
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
-						<inp2:m_if check="m_ConfigEquals" name="Email_As_Login" value="0">
+						<inp2:m_if check="u_UseUsernames">
 							<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">