Index: branches/1.2.x/platform/elements/side_boxes/login.elm.tpl
===================================================================
diff -u -N -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 />