diff --git a/modules/member/m.skins/default/login_form.html b/modules/member/m.skins/default/login_form.html
index 616389278..4313b0667 100644
--- a/modules/member/m.skins/default/login_form.html
+++ b/modules/member/m.skins/default/login_form.html
@@ -12,7 +12,7 @@
 		<input type="hidden" name="success_return_url" value="{$referer_url}" />
 		<input type="hidden" name="xe_validator_id" value="modules/member/m.skin/default/login_form/1" />
 		<ul>
-			<li><label for="id"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label><input name="user_id" type="<!--@if($identifier == 'user_id')-->text<!--@else-->email<!--@end-->" id="id" value="" /></li>
+			<li><label for="id"><!--@if($identifier == 'email_address')-->{$lang->email_address}<!--@else-->{$lang->user_id}<!--@end--></label><input name="user_id" type="<!--@if($identifier == 'email_address')-->email<!--@else-->text<!--@end-->" id="id" value="" /></li>
 			<li><label for="pw">{$lang->password}</label><input name="password" type="password" id="pw" value="" /></li>
 		</ul>
 		<div class="captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('login')">
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index 8c3a10759..da6033948 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -14,8 +14,8 @@
 			<input type="hidden" name="xe_validator_id" value="modules/member/skins" />
 			<fieldset>
 				<div class="control-group">
-					<input type="text" cond="$identifier == 'user_id'" name="user_id" id="uid" required placeholder="{$lang->user_id}" title="{$lang->user_id}" />
-					<input type="email" cond="$identifier != 'user_id'" name="user_id" id="uid" required placeholder="{$lang->email_address}" title="{$lang->email_address}" />
+					<input type="text" cond="$identifier != 'email_address'" name="user_id" id="uid" required placeholder="{$lang->user_id}" title="{$lang->user_id}" />
+					<input type="email" cond="$identifier == 'email_address'" name="user_id" id="uid" required placeholder="{$lang->email_address}" title="{$lang->email_address}" />
 					<input type="password" name="password" id="upw" required placeholder="{$lang->password}" title="{$lang->password}" />
 				</div>
 				<div class="control-group captcha" cond="isset($captcha) && $captcha && $captcha->isTargetAction('login')">
diff --git a/modules/message/m.skins/default/system_message.html b/modules/message/m.skins/default/system_message.html
index dbc0f49df..146449e3b 100644
--- a/modules/message/m.skins/default/system_message.html
+++ b/modules/message/m.skins/default/system_message.html
@@ -28,8 +28,8 @@
 			<input type="hidden" name="xe_validator_id" value="modules/message/m.skin/default/system_message/1" />
 				<fieldset>
 					<ul>
-						<li cond="$member_config->identifier == 'user_id'"><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" required autofocus /></li>
-						<li cond="$member_config->identifier != 'user_id'"><label for="uid">{$lang->email_address}</label><input type="email" name="user_id" id="uid" required autofocus /></li>
+						<li cond="$member_config->identifier != 'email_address'"><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" required autofocus /></li>
+						<li cond="$member_config->identifier == 'email_address'"><label for="uid">{$lang->email_address}</label><input type="email" name="user_id" id="uid" required autofocus /></li>
 						<li><label for="upw">{$lang->password}</label><input type="password" name="password" id="upw" value="" /></li>
 					</ul>
 					<p>