diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 843dacb04..25e0af862 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -238,7 +238,7 @@
 			foreach($signupForm as $formInfo){
 				if ($formInfo->required || $formInfo->mustRequired){
 					if($formInfo->name == 'password')
-						$fields[] = '<field name="password" ><if test="$act == \'procMemberInsert\'" attr="password" value="true" /></field>';
+						$fields[] = '<field name="password" ><if test="$act == \'procMemberInsert\'" attr="required" value="true" /></field>';
 					else if($formInfo->name == 'find_account_question'){
 						$fields[] = '<field name="find_account_question" required="true" />';
 						$fields[] = '<field name="find_account_answer" required="true" />';
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 45d0acea0..26b894bbf 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1622,6 +1622,8 @@
                     }
                 }
             }
+
+			$member_config = $oModuleModel->getModuleConfig('member');
             // When using email authentication mode (when you subscribed members denied a) certified mail sent
             if ($args->denied == 'Y') {
                 // Insert data into the authentication DB
@@ -1638,9 +1640,23 @@
                 }
                 // Get content of the email to send a member
                 Context::set('auth_args', $auth_args);
-                Context::set('member_info', $args);
 
-                $member_config = $oModuleModel->getModuleConfig('member');
+				global $lang;
+				if (is_array($member_config->signupForm)){
+					$exceptForm=array('password', 'find_account_question');
+					foreach($member_config->signupForm as $form){
+						if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired)){
+							$memberInfo[$lang->{$form->name}] = $args->{$form->name};
+						}
+					}
+				}else{
+					$memberInfo[$lang->user_id] = $args->user_id;
+					$memberInfo[$lang->user_name] = $args->user_name;
+					$memberInfo[$lang->nick_name] = $args->nick_name;
+					$memberInfo[$lang->email_address] = $args->email_address;
+				}
+                Context::set('memberInfo', $memberInfo);
+
                 if(!$member_config->skin) $member_config->skin = "default";
                 if(!$member_config->colorset) $member_config->colorset = "white";
 
diff --git a/modules/member/skins/default/confirm_member_account_mail.html b/modules/member/skins/default/confirm_member_account_mail.html
index ba12e647b..1e0950baf 100644
--- a/modules/member/skins/default/confirm_member_account_mail.html
+++ b/modules/member/skins/default/confirm_member_account_mail.html
@@ -2,10 +2,7 @@
 <hr noshade="noshade" />
 <ul>
     <li>Site : <a href="{getUrl()}" target="_blank">{getUrl()}</a></li>
-    <li>{$lang->user_id} : {$member_info->user_id}</li>
-    <li>{$lang->user_name} : {$member_info->user_name}</li>
-    <li>{$lang->nick_name} : {$member_info->nick_name}</li>
-    <li>{$lang->email_address} : {$member_info->email_address}</li>
+    <li loop="$memberInfo=>$name,$value">{$name} : {$value}</li>
 </ul>
 <hr noshade="noshade" />
 {$lang->msg_confirm_account_comment}<br />