diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php
index bcff1796b..c72a60cd5 100644
--- a/modules/member/lang/en.php
+++ b/modules/member/lang/en.php
@@ -193,6 +193,8 @@ $lang->msg_exists_phone_number = 'This phone number has already been registered.
 $lang->msg_invalid_phone_country = 'The phone number belongs to an unsupported country.';
 $lang->msg_invalid_phone_number = 'The phone number you have entered is invalid.';
 $lang->msg_exists_nick_name = 'This nickname already exists. Please try another one.';
+$lang->msg_nickname_not_changeable = 'The nickname cannot be changed.';
+$lang->msg_email_address_not_changeable = 'You cannot change your email address here. Please use the "Change Email Address" page to do so.';
 $lang->msg_signup_disabled = 'You are not able to sign up';
 $lang->msg_already_logged = 'You have already signed up.';
 $lang->msg_not_logged = 'Please log in.';
diff --git a/modules/member/lang/ko.php b/modules/member/lang/ko.php
index 5506d086e..69381daf9 100644
--- a/modules/member/lang/ko.php
+++ b/modules/member/lang/ko.php
@@ -195,6 +195,8 @@ $lang->msg_exists_phone_number = '이미 가입된 전화번호입니다.';
 $lang->msg_invalid_phone_country = '전화번호의 국가가 잘못 선택되었습니다.';
 $lang->msg_invalid_phone_number = '전화번호가 형식에 맞지 않습니다.';
 $lang->msg_exists_nick_name = '이미 사용중인 닉네임입니다. 다른 닉네임을 선택해 주세요.';
+$lang->msg_nickname_not_changeable = '닉네임은 변경할 수 없습니다.';
+$lang->msg_email_address_not_changeable = '이메일 주소는 이 화면에서 변경할 수 없습니다. "이메일 주소 변경" 메뉴를 이용해 주세요.';
 $lang->msg_signup_disabled = '회원 가입할 수 없습니다.';
 $lang->msg_already_logged = '이미 로그인되어 있습니다.';
 $lang->msg_not_logged = '로그인이 필요합니다.';
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 1ae3c7170..aaf55512b 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1059,7 +1059,19 @@ class MemberController extends Member
 		// Check if nickname change is allowed
 		if(isset($config->allow_nickname_change) && $config->allow_nickname_change === 'N')
 		{
-			$args->nick_name = $logged_info->nick_name;
+			if (!empty($args->nick_name) && $args->nick_name !== $logged_info->nick_name)
+			{
+				return new BaseObject(-1, 'msg_nickname_not_changeable');
+			}
+		}
+
+		// Check if email address change is allowed
+		if(isset($config->enable_confirm) && $config->enable_confirm === 'Y')
+		{
+			if (!empty($args->email_address) && $args->email_address !== $logged_info->email_address)
+			{
+				return new BaseObject(-1, 'msg_email_address_not_changeable');
+			}
 		}
 
 		// Check symbols in nickname