diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 9afa8d3ea..9ec2cb4a9 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -91,6 +91,12 @@
 
             $member_config = $oMemberModel->getMemberConfig();
             Context::set('member_config', $member_config);
+
+			global $lang;
+			$identifierForm->title = $lang->{$member_config->identifier};
+			$identifierForm->name = $member_config->identifier;
+			$identifierForm->value = $member_info->{$member_config->identifier};
+			Context::set('identifierForm', $identifierForm);
             // Set a template file
             $this->setTemplateFile('signup_form');
         }
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index 829b14cc7..3f3a16f75 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -36,10 +36,10 @@
 
 		<ul>
 			<li>
-				<p class="q">{$lang->email_address} <em style="color:red">*</em></p>
+				<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>
 				<p class="a">
-					<input type="hidden" name="email_address" value="{$member_info->email_address}" />
-					<input type="text"  value="{$member_info->email_address}" disabled="disabled" />
+					<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />
+					<input type="text" name="{$identifierForm->name}" value="{$identifierForm->value}" disabled="disabled" />
 				</p>
 			</li>
 			<li loop="$formTags=>$formTag">
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 1f4c663bf..d87d495d2 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -24,9 +24,10 @@
     <!--@end-->
 		<ul>
 			<li>
-				<p class="q">{$lang->email_address} <em style="color:red">*</em></p>
+				<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>
 				<p class="a">
-					<input type="text" name="email_address" value="{$member_info->email_address}" />
+					<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />
+					<input type="text" name="{$identifierForm->name}" value="{$identifierForm->value}" disabled="disabled" />
 				</p>
 			</li>
 			<li>