From 3469a3bdbfabf1ae469b848840f1d25764a69e40 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 18 Dec 2015 14:21:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=20=EB=98=90?=
 =?UTF-8?q?=EB=8A=94=20=EB=A9=94=EC=9D=BC=20=EC=A3=BC=EC=86=8C=EB=A1=9C=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=ED=97=88=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.admin.controller.php | 2 +-
 modules/member/member.controller.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 1ef07603a..30d735070 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -557,7 +557,7 @@ class memberAdminController extends member
 			'</ruleset>';
 
 		$fields = array();
-		$trans = array('email_address'=>'email', 'user_id'=> 'userid');
+		$trans = array('email_address'=>'email', 'user_id'=> '');
 		$fields[] = sprintf('<field name="user_id" required="true" rule="%s"/>', $trans[$identifier]);
 		$fields[] = '<field name="password" required="true" />';
 
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 3f879acc5..59cb96c23 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1670,7 +1670,7 @@ class memberController extends member
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		// check identifier
-		if($config->identifier == 'email_address')
+		if($config->identifier == 'email_address' || strpos($user_id, '@') !== false)
 		{
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);