Index: trunk/themes/default/misc/right_login.tpl
===================================================================
diff -u -N -r640 -r1829
--- trunk/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 640)
+++ trunk/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 1829)
@@ -28,7 +28,13 @@
 					<td valign="top">
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
 							<tr>
-								<td class="field-title"><inp:m_language _Phrase="lu_prompt_username" />:</td>
+								<td class="field-title">
+									<inp2:m_if check="u_UseUsernames">
+										<inp:m_language _Phrase="lu_prompt_username" />:
+									<inp2:m_else/>
+										<inp:m_language _Phrase="lu_prompt_email" />:
+									</inp2:m_if>
+								</td>
 							</tr>
 							<tr>
 								<td><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>