diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index f2618f375..ab48cb2c5 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -505,7 +505,7 @@ class MemberAdminView extends Member
 
 		foreach($member_config->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse || in_array($formInfo->name, $identifiers) || $formInfo->name == 'password')
+			if(!$formInfo->isUse || (in_array($formInfo->name, $identifiers) && $formInfo->name === array_first($identifiers)) || $formInfo->name == 'password')
 			{
 				continue;
 			}
@@ -595,8 +595,16 @@ class MemberAdminView extends Member
 					}
 					else if($formInfo->name == 'email_address')
 					{
+						if(isset($member_config->enable_confirm) && $member_config->enable_confirm === 'Y')
+						{
+							$readonly = 'readonly="readonly" ';
+						}
+						else
+						{
+							$readonly = '';
+						}
 						$formTag->type = 'email';
-						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
+						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" ' . $readonly . '/>';
 					}
 					else if($formInfo->name == 'phone_number')
 					{
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index a8f553330..1167a35f2 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -23,7 +23,7 @@
 		<label for="{$identifierForm->name}" class="control-label">{$identifierForm->title} <em style="color:red">*</em></label>
 		<div class="controls">
 			<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />
-			<input type="text" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" disabled="disabled" />
+			<input type="text" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" readonly="readonly" />
 		</div>
 	</div>
 	<div class="control-group" loop="$formTags=>$formTag">