diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index ebf88c7f7..0b23160d0 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -361,8 +361,11 @@
             $extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
 			
 			if ($memberInfo)
+			{
 				$memberInfo = get_object_vars($memberInfo);
+			}
 			$member_config = $this->memberConfig;
+			
 			$formTags = array();
 			global $lang;
 
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index cf7f21df8..667392921 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -33,19 +33,19 @@
             // Get member configuration stored in the DB
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('member');
-			//for multi language
-			if(is_array($config->signupForm))
+
+			if(!$config->signupForm || !is_array($config->signupForm))
 			{
-				foreach($config->signupForm AS $key=>$value)
-				{
-					$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
-					if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
-					if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
-				}
+				$oMemberAdminController = getAdminController('member');
+				$identifier = ($config->identifier) ? $config->identifier : 'email_address';
+				$config->signupForm = $oMemberAdminController->createSignupForm($identifier);
 			}
-			else
+			//for multi language
+			foreach($config->signupForm AS $key=>$value)
 			{
-				$config->signupForm = array();
+				$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
+				if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
+				if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
 			}
 
             // Get terms of user