diff --git a/WebContent/jsp/common/screen/emergency.jsp b/WebContent/jsp/common/screen/emergency.jsp
index b98632b..d2a2149 100644
--- a/WebContent/jsp/common/screen/emergency.jsp
+++ b/WebContent/jsp/common/screen/emergency.jsp
@@ -91,7 +91,10 @@
 				data: $('#loginForm').serialize(),
 				dataType: 'json',
 				success: function(response) {
-					if (response.smsAuthRequired) {
+					if (response.changePassword) {
+						showChangeInitPassword(response);
+					}
+					else if (response.smsAuthRequired) {
 						// SMS 인증 필요
 						showSmsAuthModal(response);
 					} else if (response.success) {
@@ -108,6 +111,13 @@
 				}
 			});
 		}
+		
+		function showChangeInitPassword(data) {
+			$('input[name="resetUserId"]').val($('input[name="userId"]').val());
+			$('input[name="resetPassword"]').val($('input[name="password"]').val());
+			$('#changeInitPassword').hide();
+			$('#pwdChgModal').modal('show');
+		}
 
 		// SMS 인증 모달 표시
 		function showSmsAuthModal(data) {
@@ -218,44 +228,39 @@
 			clearInterval(resendTimer);
 			$('#smsAuthModal').modal('hide');
 		}
-		function changePwd(){
+		
+		function checkPwd(){
 			if ($("input[name=resetUserId]").val() == null || $("input[name=resetUserId]").val().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkid") %>");
 				$("input[name=resetUserId]").trigger("focus");
-				return;
+				return false;
 			}
 			if ($("input[name=resetPassword]").val() == null || $("input[name=resetPassword]").val().trim().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkpwd1") %>");
 				$("input[name=resetPassword]").trigger("focus");
-				return;
+				return false;
 			}
 			if ($("input[name=changePassword]").val() == null || $("input[name=changePassword]").val().trim().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkpwd2") %>");
 				$("input[name=changePassword]").trigger("focus");
-				return ;
+				return false;
 			}
 			if ($("input[name=confirmPassword]").val() == null || $("input[name=confirmPassword]").val().trim().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkpwd3") %>");
-				return ;
+				return false;
 			}
-			if ($("input[name=confirmPassword]").val() != $("input[name=confirmPassword]").val()){
+			if ($("input[name=changePassword]").val() != $("input[name=confirmPassword]").val()){
 				alert("<%= localeMessage.getString("login.checkpwd4") %>");
 				$("input[name=confirmPassword]").trigger("focus");
-				return ;
+				return false;
 			}
 			if ($("input[name=resetUserId]").val() == $("input[name=changePassword]").val()){
 				alert("<%= localeMessage.getString("login.checkpwd5") %>");
 				$("input[name=changePassword]").trigger("focus");
-				return ;
+				return false;
 			}
 
-			//if (idCheck.checked){
-			//		setCookie("key",id);
-			//}
-			<%--   $("form").attr("action","<c:url value="/changePassword.do"/>");
-              //$("form").action = "<%=request.getContextPath()%>/changePassword.do";
-              --%>
-			$("form").submit();
+			return true;
 		}
 		
 		$(document).ready(function() {
@@ -271,14 +276,22 @@
 			});
 			$("input[name=changePassword]").keydown(function(event){
 				if ( event.which == 13 ) {
-					changePwd();
+					$('#modalLoginForm').submit();
 				}
 			});
 			$("input[name=confirmPassword]").keydown(function(event){
 				if ( event.which == 13 ) {
-					changePwd();
+					$('#modalLoginForm').submit();
 				}
 			});
+			// Password Change 링크로 직접 열 때만 초기화 (JS에서 modal('show') 호출 시 relatedTarget 없음)
+			$('#pwdChgModal').on('show.bs.modal', function(event) {
+				if (event.relatedTarget) {
+					$('#modalLoginForm')[0].reset();
+					$('#changeInitPassword').show();
+				}
+			});
+
 			$("select[name=serviceType]").change(function(){
 				fncPreMain();
 			});
@@ -286,9 +299,7 @@
 			$("#btn_login").click(function(){
 				fncPreMain();
 			});
-			$("#changePwd").click(function(){
-				changePwd();
-			});
+			
 			$("#btn_sso_login").click(function(){
 				fncSsoLogin();
 			});
@@ -366,7 +377,7 @@
 	</div>
 </div>
 
-
+<!-- 비밀번호 변경 모달 -->
 <div class="modal fade" id="pwdChgModal" tabindex="-1" role="dialog" aria-labelledby="pwdChgModalLabel" aria-hidden="true">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
@@ -376,13 +387,15 @@
 					<span aria-hidden="true">X</span>
 				</button>
 			</div>
-			<form name="form" id="modalLoginForm" action="<c:url value="/changePassword.do"/>" method="post">
+			<form  id="modalLoginForm" action="<c:url value="/changePassword.do"/>" method="post" onsubmit="return checkPwd()" novalidate>
 				<div class="modal-body">
-					<div class="form-group d-flex">
-						<input type="text" name="resetUserId" class="form-control rounded-left" placeholder="User Id" required>
-					</div>
-					<div class="form-group d-flex">
-						<input type="password" name="resetPassword" class="form-control rounded-left" placeholder="<%= localeMessage.getString("login.placeholderCurrentPassword") %>" autocomplete="off" required>
+					<div id="changeInitPassword">
+						<div class="form-group d-flex">
+							<input type="text" name="resetUserId" class="form-control rounded-left" placeholder="User Id" required>
+						</div>
+						<div class="form-group d-flex">
+							<input type="password" name="resetPassword" class="form-control rounded-left" placeholder="<%= localeMessage.getString("login.placeholderCurrentPassword") %>" autocomplete="off" required>
+						</div>
 					</div>
 					<p><%= localeMessage.getString("login.toChangePasswordMessage") %></p>
 					<div class="form-group d-flex">
@@ -393,7 +406,7 @@
 					</div>
 				</div>
 				<div class="modal-footer">
-					<input type="button" id ="changePwd" class="form-control btn btn-primary rounded submit px-3" value="변경">
+					<button type="submit" id="changePwd" class="form-control btn btn-primary rounded submit px-3">변경</button>
 				</div>
 			</form>
 		</div>
diff --git a/src/main/java/com/eactive/eai/rms/common/acl/user/UserManService.java b/src/main/java/com/eactive/eai/rms/common/acl/user/UserManService.java
index 33ff53c..8a54dba 100644
--- a/src/main/java/com/eactive/eai/rms/common/acl/user/UserManService.java
+++ b/src/main/java/com/eactive/eai/rms/common/acl/user/UserManService.java
@@ -42,7 +42,7 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class UserManService extends BaseService {
 	
-	private final String DEFAULT_PASSWORD_SUBFIX = "@!";
+	
 
 	private final UserInfoService userInfoService;
 	private final UserRoleService userRoleService;
@@ -100,9 +100,11 @@ public class UserManService extends BaseService {
 
 		UserInfo userInfo = userUIMapper.toEntity(userUI);
 		userInfo.setRoleidnfiname(CommonConstants.DEPT_DEVELOPER);
+		
+		String subfix = monitoringContext.getStringProperty(MonitoringContext.RMS_PASSWORD_INIT_SUBFIX, "@!");
 
 		try {
-			userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,userUI.getUserId()+DEFAULT_PASSWORD_SUBFIX));
+			userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,userUI.getUserId()+subfix));
 		} catch (Exception e) {
 			throw new RuntimeException("Error encrypting password", e);
 		}
@@ -142,8 +144,9 @@ public class UserManService extends BaseService {
 	}
 
 	public void updatePassword(UserUI userUI) throws Exception {
+		String subfix = monitoringContext.getStringProperty(MonitoringContext.RMS_PASSWORD_INIT_SUBFIX, "@!");
 		UserInfo userInfo = userInfoService.getById(userUI.getUserId());
-		userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256, userUI.getUserId()+DEFAULT_PASSWORD_SUBFIX));
+		userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256, userUI.getUserId()+subfix));
 		userUIMapper.updateToEntity(userUI, userInfo);
 		userInfoService.save(userInfo);
 	}
diff --git a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java
index e9d6ed9..530933b 100644
--- a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java
+++ b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java
@@ -262,6 +262,9 @@ public interface MonitoringContext {
    public static final String API_WEBHOOK_RETRY_COUNT = "api.webhook.retry_count";
    public static final String API_WEBHOOK_RETRY_TIME  = "api.webhook.retry_time";
    
+   //비밀번호 초기화 접미사
+   public static final String RMS_PASSWORD_INIT_SUBFIX = "rms.password.init.subfix";
+   
    
 
 	public abstract String getStringProperty(String propertyName);
diff --git a/src/main/java/com/eactive/eai/rms/common/login/LoginResponseDto.java b/src/main/java/com/eactive/eai/rms/common/login/LoginResponseDto.java
index 3a3e83c..e4b1981 100644
--- a/src/main/java/com/eactive/eai/rms/common/login/LoginResponseDto.java
+++ b/src/main/java/com/eactive/eai/rms/common/login/LoginResponseDto.java
@@ -45,4 +45,9 @@ public class LoginResponseDto {
      * 에러 메시지 (로그인 실패 시)
      */
     private String errorMessage;
+    
+    /**
+     * 초기 비밀번호 변경 필요 여부
+     */
+    private boolean changePassword;
 }
diff --git a/src/main/java/com/eactive/eai/rms/common/login/MainController.java b/src/main/java/com/eactive/eai/rms/common/login/MainController.java
index bff4fae..78f7a2d 100644
--- a/src/main/java/com/eactive/eai/rms/common/login/MainController.java
+++ b/src/main/java/com/eactive/eai/rms/common/login/MainController.java
@@ -191,6 +191,19 @@ public class MainController implements InterceptorSkipController {
 						.redirectUrl(redirectUrl)
 						.build();
 			}
+			
+
+			// 2.1 초기 비밀번호인 경우, 비밀번호 변경해야 함
+			String subfix = monitoringContext.getStringProperty(MonitoringContext.RMS_PASSWORD_INIT_SUBFIX, "@!");
+			if (userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256, userInfo.getUserid()+subfix))
+					|| userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256, userInfo.getUserid()))) {
+				return LoginResponseDto.builder()
+						.success(false)
+						.changePassword(true)
+						.errorMessage("비밀번호 변경후 사용가능합니다.")
+						.build();
+			}
+			
 
 			// 3. SMS 인증 필요 여부 체크
 			SmsAuthService smsAuthService = getSmsAuthService();
@@ -758,6 +771,9 @@ public class MainController implements InterceptorSkipController {
 								 String changePassword, String confirmPassword,
 								 String resetUserId, String resetPassword) {
 		HttpSession session = request.getSession();
+		// AJAX 로그인 인증 후 초기비밀번호 변경 경로에서 세션에 부분 로그인 상태가 남아
+		// root emergency.jsp가 main.do로 잘못 리다이렉트하는 것을 방지
+		session.removeAttribute(CommonConstants.LOGIN);
 
 		try {
 
@@ -815,6 +831,8 @@ public class MainController implements InterceptorSkipController {
 					.getString("login.pwdchanged"));
 			session.setAttribute(RESULT_MSG, localeMessage
 					.getString("login.pwdchanged"));
+			logger.debug("\n\n\n\n===================" + localeMessage
+					.getString("login.pwdchanged"));
 			return REDIRECT_LOGIN_URL;
 
 		} catch (Exception e) {