Index: trunk/themes/default/login/login_form.tpl
===================================================================
diff -u -r1120 -r1829
--- trunk/themes/default/login/login_form.tpl	(.../login_form.tpl)	(revision 1120)
+++ trunk/themes/default/login/login_form.tpl	(.../login_form.tpl)	(revision 1829)
@@ -12,7 +12,14 @@
 	  			<td colspan="3" class="error"><inp:m_list_form_errors _Form="login" _ItemTemplate="misc/form_error.tpl" /></td>
 	  		</tr>
 	  		<tr>
-	  			<td class="field-name"><inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> <span class="error">*</span></td>
+	  			<td class="field-name">
+	  				<inp2:m_if check="u_UseUsernames">
+						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_username" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+					<inp2:m_else/>
+						<inp:m_form_prompt _field="login_user" _Form="login" _langtext="lu_prompt_email" _Template="misc/form_prompt.tpl" _ErrorTemplate="misc/form_prompt_error.tpl" /> 
+					</inp2:m_if>
+	  				<span class="error">*</span>
+	  			</td>
 	  			<td width="100%" class="field-content-input"><inp:m_form_input type="text" class="input" style="width:135px;" _field="login_user" _Form="login" _Required="1" /><br /></td>
 	  			<td>&nbsp;</td>
 	  		</tr>