diff --git a/src/main/java/com/eactive/apim/portal/apps/user/service/MessageRequestService.java b/src/main/java/com/eactive/apim/portal/apps/user/service/MessageRequestService.java
index b174916..406e9e2 100644
--- a/src/main/java/com/eactive/apim/portal/apps/user/service/MessageRequestService.java
+++ b/src/main/java/com/eactive/apim/portal/apps/user/service/MessageRequestService.java
@@ -1,7 +1,7 @@
 package com.eactive.apim.portal.apps.user.service;
 
+import com.eactive.apim.portal.template.entity.MessageCode;
 import com.eactive.apim.portal.template.entity.MessageRequest;
-import com.eactive.apim.portal.template.entity.MessageRequestEnums;
 import com.eactive.apim.portal.template.repository.MessageRequestRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ public class MessageRequestService {
         MessageRequest messageRequest = new MessageRequest();
 
         // String을 MessageCode enum으로 변환
-        MessageRequestEnums.MessageCode messageCode = MessageRequestEnums.MessageCode.valueOf(messageCodeStr);
+        MessageCode messageCode = MessageCode.valueOf(messageCodeStr);
 
         // MessageRequest 설정
         messageRequest.setMessageCode(messageCode);
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 ccf595b..a92dd5d 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
@@ -14,21 +14,11 @@ 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;
 import com.eactive.apim.portal.template.entity.MessageRequest;
-import com.eactive.apim.portal.template.entity.MessageRequestEnums;
 import com.eactive.apim.portal.template.repository.MessageRequestRepository;
 import com.eactive.apim.portal.template.service.MessageHandlerService;
 import com.eactive.apim.portal.template.service.MessageRecipient;
-
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import lombok.RequiredArgsConstructor;
 import org.apache.xerces.impl.dv.util.Base64;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -39,6 +29,16 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -120,7 +120,7 @@ public class PortalUserAuthService implements UserDetailsService {
 
         // Enum을 직접 전달
         List<MessageRequest> messageRequests = messageRequestRepository.findByEmailAndMessageCode(
-            user.getLoginId(), MessageRequestEnums.MessageCode.USER_ACTIVATION
+            user.getLoginId(), MessageCode.USER_ACTIVATION
         );
 
         if (!messageRequests.isEmpty()) {