Index: branches/1.2.x/_install/english.lang
===================================================================
diff -u -r14720 -r14727
--- branches/1.2.x/_install/english.lang	(.../english.lang)	(revision 14720)
+++ branches/1.2.x/_install/english.lang	(.../english.lang)	(revision 14727)
@@ -93,12 +93,10 @@
 			<PHRASE Label="lu_description_PrivateMessages" Module="Core" Type="0">WW91ciBQcml2YXRlIE1lc3NhZ2Vz</PHRASE>
 			<PHRASE Label="lu_details" Module="Core" Type="0">RGV0YWlscw==</PHRASE>
 			<PHRASE Label="lu_edit" Module="Core" Type="0">TW9kaWZ5</PHRASE>
-			<PHRASE Label="LU_EMAIL" Module="Core" Type="0">RS1NYWls</PHRASE>
 			<PHRASE Label="lu_email_already_exist" Module="Core" Type="0">QSB1c2VyIHdpdGggc3VjaCBlLW1haWwgYWxyZWFkeSBleGlzdHMu</PHRASE>
 			<PHRASE Label="lu_email_send_error" Module="Core" Type="0">TWFpbCBzZW5kaW5nIGZhaWxlZA==</PHRASE>
 			<PHRASE Label="lu_EnterEmailToRecommend" Module="Core" Type="0">RnJpZW5kJ3MgZS1tYWlsIGFkZHJlc3M=</PHRASE>
 			<PHRASE Label="lu_EnterEmailToSubscribe" Module="Core" Type="0">WW91ciBlLW1haWwgYWRkcmVzcw==</PHRASE>
-			<PHRASE Label="lu_EnterForgotEmail" Module="Core" Type="0">RW50ZXIgeW91ciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg==</PHRASE>
 			<PHRASE Label="lu_EnterForgotUserEmail" Module="Core" Type="0">RW50ZXIgeW91ciBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg==</PHRASE>
 			<PHRASE Label="lu_ErrorAlreadyReviewed" Module="Core" Type="0">WW91IGhhdmUgYWxyZWFkeSBjb21tZW50ZWQgdGhpcyBpdGVtIQ==</PHRASE>
 			<PHRASE Label="lu_error_404_description" Module="Core" Type="0">U29ycnksIHRoZSByZXF1ZXN0ZWQgVVJMIHdhcyBub3QgZm91bmQgb24gb3VyIHNlcnZlci4=</PHRASE>
@@ -161,6 +159,7 @@
 			<PHRASE Label="lu_fld_Description" Module="Core" Type="0">RGVzY3JpcHRpb24=</PHRASE>
 			<PHRASE Label="lu_fld_Duration" Module="Core" Type="0">RHVyYXRpb24=</PHRASE>
 			<PHRASE Label="lu_fld_Email" Module="Core" Type="0">RS1NYWls</PHRASE>
+			<PHRASE Label="lu_fld_EmailOrUsername" Module="Core" Type="0">RS1tYWlsIG9yIFVzZXJuYW1l</PHRASE>
 			<PHRASE Label="lu_fld_Fax" Module="Core" Type="0">RmF4</PHRASE>
 			<PHRASE Label="lu_fld_File" Module="Core" Type="0">RmlsZQ==</PHRASE>
 			<PHRASE Label="lu_fld_File1" Module="Core" Type="0">UHJpbWFyeSBGaWxl</PHRASE>
@@ -240,7 +239,6 @@
 			<PHRASE Label="lu_OldToRecent" Module="Core" Type="0">T2xkIHRvIFJlY2VudA==</PHRASE>
 			<PHRASE Label="LU_Opt_SelectCategory" Module="Core" Type="0">U2VsZWN0IENhdGVnb3J5</PHRASE>
 			<PHRASE Label="lu_or" Module="Core" Type="0">b3I=</PHRASE>
-			<PHRASE Label="lu_password" Module="Core" Type="0">UGFzc3dvcmQ=</PHRASE>
 			<PHRASE Label="lu_passwords_do_not_match" Module="Core" Type="0">UGFzc3dvcmRzIGRvIG5vdCBtYXRjaA==</PHRASE>
 			<PHRASE Label="lu_passwords_too_short" Module="Core" Type="0">UGFzc3dvcmQgaXMgdG9vIHNob3J0LCBwbGVhc2UgZW50ZXIgYXQgbGVhc3QgJXMgY2hhcmFjdGVycw==</PHRASE>
 			<PHRASE Label="lu_PendingItem" Module="Core" Type="0">cGVuZGluZyBpdGVt</PHRASE>
@@ -373,9 +371,7 @@
 			<PHRASE Label="lu_unsubscribe_confirm" Module="Core" Type="0">VW5zdWJzY3JpcHRpb24gQ29uZmlybWF0aW9u</PHRASE>
 			<PHRASE Label="lu_unsubscribe_confirm_prompt" Module="Core" Type="0">QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIHVuc3Vic2NyaWJlIGZyb20gb3VyIG1haWxpbmcgbGlzdD8gKFlvdSBjYW4gYWx3YXlzIHN1YnNjcmliZSBhZ2FpbiBieSBlbnRlcmluZyB5b3VyIGVtYWlsIGF0IHRoZSBob21lIHBhZ2Up</PHRASE>
 			<PHRASE Label="lu_unsubscribe_title" Module="Core" Type="0">VW5zdWJzY3JpYmU=</PHRASE>
-			<PHRASE Label="lu_username" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
 			<PHRASE Label="lu_user_already_exist" Module="Core" Type="0">QSB1c2VyIHdpdGggc3VjaCB1c2VybmFtZSBhbHJlYWR5IGV4aXN0cy4=</PHRASE>
-			<PHRASE Label="lu_user_and_email_already_exist" Module="Core" Type="0">QSB1c2VyIHdpdGggc3VjaCB1c2VybmFtZS9lLW1haWwgYWxyZWFkeSBleGlzdHMu</PHRASE>
 			<PHRASE Label="lu_user_pending_aproval_text" Module="Core" Type="0">VGhhbmsgeW91IGZvciByZWdpc3RlcmluZy4gWW91ciByZWdpc3RyYXRpb24gaXMgcGVuZGluZyBhZG1pbmlzdHJhdGl2ZSBhcHByb3ZhbC4=</PHRASE>
 			<PHRASE Label="lu_VerifyPassword" Module="Core" Type="0">VmVyaWZ5IHBhc3N3b3Jk</PHRASE>
 			<PHRASE Label="lu_visit_DirectReferer" Module="Core" Type="0">RGlyZWN0IGFjY2VzcyBvciBib29rbWFyaw==</PHRASE>
Index: branches/1.2.x/platform/elements/side_boxes/login.elm.tpl
===================================================================
diff -u -r14593 -r14727
--- branches/1.2.x/platform/elements/side_boxes/login.elm.tpl	(.../login.elm.tpl)	(revision 14593)
+++ branches/1.2.x/platform/elements/side_boxes/login.elm.tpl	(.../login.elm.tpl)	(revision 14727)
@@ -84,17 +84,12 @@
 	<form method="post" action="<inp2:m_FormAction />">
 		<inp2:u.login-sidebox_FormName name="login"/>
 
-		<inp2:m_if check="u.login-sidebox_UseUsernames">
-			<inp2:m_phrase label="lu_username"/><br />
-		<inp2:m_else/>
-			<inp2:m_phrase label="lu_email"/><br />
-		</inp2:m_if>
-
+		<inp2:m_phrase label="lu_fld_EmailOrUsername"/><br />
 		<input class="input-text" type="text" name="<inp2:u.login-sidebox_InputName name='UserLogin'/>" value="<inp2:u.login-sidebox_Field name='UserLogin'/>" style="width:155px" /><br />
 
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
 
-		<inp2:m_Phrase label="lu_Password"/><br />
+		<inp2:m_Phrase label="lu_fld_Password"/><br />
 		<input type="password" class="input-text" name="<inp2:u.login-sidebox_InputName name='UserPassword'/>" value="<inp2:u.login-sidebox_Field name='UserPassword'/>" style="width:155px" /><br />
 
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
Index: branches/1.2.x/platform/login/forgot_password.tpl
===================================================================
diff -u -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"/>