diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index fe6a92e7a..35f5343b6 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1824,23 +1824,13 @@ class MemberController extends Member
 		Context::set('auth_args', $args);
 
 		$memberInfo = array();
-		if(is_array($member_config->signupForm))
+		if (in_array('user_id', $member_config->identifiers))
 		{
-			$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}] = $member_info->{$form->name};
-				}
-			}
+			$memberInfo[$lang->user_id] = $member_info->user_id;
 		}
-		else
+		if (in_array('email_address', $member_config->identifiers))
 		{
-			$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;
+			$memberInfo[$lang->email_address] = $member_info->email_address;
 		}
 		Context::set('memberInfo', $memberInfo);