diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 6a9e8b401..0bdfceb13 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1841,6 +1841,7 @@ class MemberController extends Member
 		}
 		Context::set('auth_args', $args);
 
+		// Prepare member information to be included in the email #2594 #2663
 		$memberInfo = array();
 		if (in_array('user_id', $member_config->identifiers))
 		{
@@ -1850,6 +1851,21 @@ class MemberController extends Member
 		{
 			$memberInfo[$lang->email_address] = $member_info->email_address;
 		}
+		if (in_array('phone_number', $member_config->identifiers))
+		{
+			$phone_number = $member_info->phone_number;
+			if($member_config->phone_number_hide_country !== 'Y')
+			{
+				$phone_number = Rhymix\Framework\i18n::formatPhoneNumber($phone_number, $member_info->phone_country);
+			}
+			elseif($member_config->phone_number_default_country === 'KOR' && ($member_info->phone_country === 'KOR' || $member_info->phone_country == '82'))
+			{
+				$phone_number = Rhymix\Framework\Korea::formatPhoneNumber($phone_number);
+			}
+			$memberInfo[$lang->phone_number] = $phone_number;
+		}
+		$memberInfo[$lang->user_name] = $member_info->user_name;
+		$memberInfo[$lang->nick_name] = $member_info->nick_name;
 		Context::set('memberInfo', $memberInfo);
 
 		if(!$member_config->skin) $member_config->skin = "default";
diff --git a/modules/member/skins/default/find_member_account_mail.html b/modules/member/skins/default/find_member_account_mail.html
index 36ace04da..151368fa4 100644
--- a/modules/member/skins/default/find_member_account_mail.html
+++ b/modules/member/skins/default/find_member_account_mail.html
@@ -2,7 +2,13 @@
 <hr noshade="noshade" />
 <ul>
 	<li>{$lang->site} : <a href="{getUrl()}" target="_blank">{getUrl()}</a></li>
-	<li loop="$memberInfo=>$name,$value" cond="!is_object($value)&&!is_array($value)">{$name} : {$value}</li>
+	<!--@if($memberInfo[$lang->user_id])-->
+	<li>{$lang->user_id} : {$memberInfo[$lang->user_id]}</li>
+	<!--@elseif($memberInfo[$lang->email_address])-->
+	<li>{$lang->email_address} : {$memberInfo[$lang->email_address]}</li>
+	<!--@elseif($memberInfo[$lang->phone_number])-->
+	<li>{$lang->phone_number} : {$memberInfo[$lang->phone_number]}</li>
+	<!--@end-->
 	<li>{$lang->password} : <span style="color:red">{$auth_args->new_password}</span></li>
 </ul>
 <hr noshade="noshade" />