diff --git a/build.gradle b/build.gradle
index 27c8ddc..779fd1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,6 +27,7 @@ dependencies {
 
     implementation project(':elink-online-core-jpa')
     implementation project(':elink-portal-common')
+    implementation project(':kjb-safedb')
 
     implementation('org.springframework.boot:spring-boot-starter')
     implementation 'org.springframework.boot:spring-boot-starter-jta-atomikos'
diff --git a/src/main/java/com/eactive/apim/portal/apps/auth/service/MessageSender.java b/src/main/java/com/eactive/apim/portal/apps/auth/service/MessageSender.java
index 70a0ab9..851f865 100644
--- a/src/main/java/com/eactive/apim/portal/apps/auth/service/MessageSender.java
+++ b/src/main/java/com/eactive/apim/portal/apps/auth/service/MessageSender.java
@@ -1,6 +1,9 @@
 package com.eactive.apim.portal.apps.auth.service;
 
+import com.eactive.apim.portal.portaluser.event.UserVerificationEmailEvent;
 import com.eactive.apim.portal.portaluser.event.UserVerificationMobilePhoneEvent;
+import com.eactive.apim.portal.template.entity.MessageCode;
+import com.eactive.apim.portal.template.service.MessageEventHandler;
 import com.eactive.apim.portal.template.service.MessageHandlerService;
 import com.eactive.apim.portal.template.service.MessageRecipient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,15 +34,15 @@ public class MessageSender {
 
 
         // 이메일, SMS MESSAEG_CODE 다름 처리
-        String messageCode = "";
+        MessageCode messageCode;
         if ("email".equalsIgnoreCase(msgType)) {
-            messageCode = "USER_VERIFICATION_EMAIL";
+            messageCode = MessageCode.USER_VERIFICATION_EMAIL;
         } else if ("sms".equalsIgnoreCase(msgType)) {
-            messageCode = "USER_VERIFICATION_MOBILEPHONE";
+            messageCode = MessageCode.USER_VERIFICATION_MOBILEPHONE;
         } else {
             throw new IllegalArgumentException("Unsupported message type: " + msgType);
         }
 
-        messageHandlerService.publishEvent(UserVerificationMobilePhoneEvent.KEY, recipient, params);
+        messageHandlerService.publishEvent(messageCode, recipient, params);
     }
 }
diff --git a/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java b/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
index 6868743..b23c960 100644
--- a/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
+++ b/src/main/java/com/eactive/apim/portal/apps/user/facade/OrgRegisterFacadeImpl.java
@@ -19,8 +19,8 @@ import com.eactive.apim.portal.file.service.FileTypeContext;
 import com.eactive.apim.portal.portalorg.entity.PortalOrg;
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums;
-import com.eactive.apim.portal.portaluser.event.UserEmailActivationEvent;
 import com.eactive.apim.portal.portaluser.repository.PortalUserRepository;
+import com.eactive.apim.portal.template.entity.MessageCode;
 import com.eactive.apim.portal.template.service.MessageHandlerService;
 import com.eactive.apim.portal.template.service.MessageRecipient;
 import lombok.RequiredArgsConstructor;
@@ -206,7 +206,7 @@ public class OrgRegisterFacadeImpl implements OrgRegisterFacade {
         try {
             String encToken = encryptionUtil.encrypt(tokenValue);
             params.put("token", Base64.encode(encToken.getBytes(StandardCharsets.UTF_8)));
-            messageHandlerService.publishEvent(UserEmailActivationEvent.KEY, recipient, params);
+            messageHandlerService.publishEvent(MessageCode.USER_VERIFICATION_EMAIL, recipient, params);
         } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException e) {
             throw new SystemException("암호화 모듈 오류");
         }
diff --git a/src/main/java/com/eactive/apim/portal/apps/user/facade/UserRegisterFacadeImpl.java b/src/main/java/com/eactive/apim/portal/apps/user/facade/UserRegisterFacadeImpl.java
index 1af158c..8c06d09 100644
--- a/src/main/java/com/eactive/apim/portal/apps/user/facade/UserRegisterFacadeImpl.java
+++ b/src/main/java/com/eactive/apim/portal/apps/user/facade/UserRegisterFacadeImpl.java
@@ -16,8 +16,8 @@ import com.eactive.apim.portal.invitation.entity.UserInvitation;
 import com.eactive.apim.portal.invitation.entity.UserInvitationEnums;
 import com.eactive.apim.portal.invitation.repository.UserInvitationRepository;
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
-import com.eactive.apim.portal.portaluser.event.UserEmailActivationEvent;
 import com.eactive.apim.portal.portaluser.repository.PortalUserRepository;
+import com.eactive.apim.portal.template.entity.MessageCode;
 import com.eactive.apim.portal.template.service.MessageHandlerService;
 import com.eactive.apim.portal.template.service.MessageRecipient;
 import lombok.RequiredArgsConstructor;
@@ -219,7 +219,7 @@ public class UserRegisterFacadeImpl implements UserRegisterFacade {
         String tokenValue = String.valueOf(authNumberGenerator.generateAuthNumber());
         // String tokenValue = registeredUser.getCreatedDate().format(DateTimeFormatter.ofPattern("yyyyMMddHHmm")) + ":" + registeredUser.getId();
         params.put("token", tokenValue);
-        messageHandlerService.publishEvent(UserEmailActivationEvent.KEY, recipient, params);
+        messageHandlerService.publishEvent(MessageCode.USER_VERIFICATION_EMAIL, recipient, params);
 
 //        try {
 //            String encToken = encryptionUtil.encrypt(tokenValue);
diff --git a/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java b/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java
index a92dd5d..dba3d17 100644
--- a/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java
+++ b/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java
@@ -11,7 +11,6 @@ import com.eactive.apim.portal.config.PortalProperties;
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums.RoleCode;
-import com.eactive.apim.portal.portaluser.event.UserEmailActivationEvent;
 import com.eactive.apim.portal.portaluser.event.UserPasswordResetEvent;
 import com.eactive.apim.portal.portaluser.repository.PortalUserRepository;
 import com.eactive.apim.portal.template.entity.MessageCode;
@@ -134,7 +133,7 @@ public class PortalUserAuthService implements UserDetailsService {
             String encToken = encryptionUtil.encrypt(tokenValue);
             params.put("token", Base64.encode(encToken.getBytes(StandardCharsets.UTF_8)));
             MessageRecipient recipient = createMessageRecipient(user);
-            messageHandlerService.publishEvent(UserEmailActivationEvent.KEY, recipient, params);
+            messageHandlerService.publishEvent(MessageCode.USER_VERIFICATION_EMAIL, recipient, params);
         } catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException e) {
             throw new SystemException("암호화 모듈 오류");
         }