diff --git a/modules/member/member.mobile.php b/modules/member/member.mobile.php
index 4950b0035..ec95550c3 100644
--- a/modules/member/member.mobile.php
+++ b/modules/member/member.mobile.php
@@ -31,8 +31,12 @@ class memberMobile extends member
             return;
         }
 
-        // Set a template file
+		// get member module configuration.
+		$oMemberModel = &getModel('member');
+		$config = $oMemberModel->getMemberConfig();
+		Context::set('identifier', $config->identifier);
 
+        // Set a template file
         Context::set('referer_url', $_SERVER['HTTP_REFERER']);
         $this->setTemplateFile('login_form');
     }
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index c36df0361..882cb8a24 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -255,6 +255,12 @@
                 $this->setTemplateFile('redirect.html');
                 return;
             }
+
+			// get member module configuration.
+			$oMemberModel = &getModel('member');
+			$config = $oMemberModel->getMemberConfig();
+			Context::set('identifier', $config->identifier);
+
             // Set a template file
             Context::set('referer_url', $_SERVER['HTTP_REFERER']);
 			Context::set('act', 'procMemberLogin');
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index bc4da1c0c..426e4a3a1 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -9,7 +9,7 @@
 	<input type="hidden" name="act" value="procMemberLogin" />
 	<ul>
 		<li>
-			<p class="q"><label for="uid">{$lang->user_id}</label></p>
+			<p class="q"><label for="uid"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label></p>
 			<p class="a"><input type="text" name="user_id" id="uid" value="" /></p>
 		</li>
 		<li>
diff --git a/modules/member/tpl/login_form.html b/modules/member/tpl/login_form.html
index 3b8b89d73..eaa7fe2a4 100644
--- a/modules/member/tpl/login_form.html
+++ b/modules/member/tpl/login_form.html
@@ -8,7 +8,7 @@
 		<input type="hidden" name="act" value="procMemberLogin" />
 		<input type="hidden" name="redirect_url" value="{getUrl('act','')}" />
 		<ul>
-			<li><label for="id">{$lang->user_id}</label><input name="user_id" type="text" id="id" value="" /></li>
+			<li><label for="id"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label><input name="user_id" type="text" id="id" value="" /></li>
 			<li><label for="pw">{$lang->password}</label><input name="password" type="password" id="pw" value="" /></li>
 		</ul>
 		<div class="bna">
diff --git a/widgets/login_info/skins/xe_global/login_form.html b/widgets/login_info/skins/xe_global/login_form.html
index 9c646861a..d4bc99200 100644
--- a/widgets/login_info/skins/xe_global/login_form.html
+++ b/widgets/login_info/skins/xe_global/login_form.html
@@ -24,8 +24,8 @@
 	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
     <div class="idpwWrap">
         <div class="idpw">
-            <input name="user_id" type="text" title="user id" />
-            <input name="password" type="password" title="password" />
+            <input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
+            <input name="password" type="password" title="{$lang->password}" />
         </div>
 		<p class="save">
         <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
diff --git a/widgets/login_info/skins/xe_globalTwo/login_form.html b/widgets/login_info/skins/xe_globalTwo/login_form.html
index ea220ef4d..5d31ca1cd 100644
--- a/widgets/login_info/skins/xe_globalTwo/login_form.html
+++ b/widgets/login_info/skins/xe_globalTwo/login_form.html
@@ -25,8 +25,8 @@
 	<h2>Login</h2>
     <div class="idpwWrap">
         <div class="idpw">
-            <input name="user_id" type="text" title="user id" />
-            <input name="password" type="password" title="password" />
+            <input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
+            <input name="password" type="password" title="{$lang->password}" />
         </div>
 		<p class="save">
         <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index d8f4a4ef8..5bb4315ce 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -20,8 +20,8 @@
 		<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
 		<div class="idpwWrap">
 			<div class="idpw">
-				<input name="user_id" type="text" title="user id" />
-				<input name="password" type="password" title="password" />
+				<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
+				<input name="password" type="password" title="{$lang->password}" />
 				<p class="keep">
 					<input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
 					<label for="keep_signed">{$lang->keep_signed}</label>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
index b24c74bee..e2f6c9e81 100644
--- a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
@@ -22,8 +22,8 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
 		<div class="body">
 			<div class="mb_input_box">
 				<div class="m_left">
-					<div class="input_text mb_id"><img src="images/bullet_input_id.gif" alt="" title="" /><input name="user_id" type="text" title="user id" /></div>
-					<div class="input_text mb_pw"><img src="images/bullet_input_pw.gif" alt="" title="" /><input name="password"type="password" title="password" /></div>
+					<div class="input_text mb_id"><img src="images/bullet_input_id.gif" alt="" title="" /><input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" /></div>
+					<div class="input_text mb_pw"><img src="images/bullet_input_pw.gif" alt="" title="" /><input name="password" type="password" title="{$lang->password}" /></div>
 					<label><input  type="checkbox" name="keep_signed" id="keepid" class="sign_check" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />{$lang->keep_signed}</label>
 					
 					<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">