diff --git a/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java b/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java
index c3180218f..4f47f85ba 100644
--- a/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java
+++ b/src/main/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImpl.java
@@ -1,9 +1,11 @@
 package org.ays.auth.service.impl;
 
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException;
+import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException;
 import org.ays.auth.exception.AysUserAlreadyExistsByEmailAddressException;
 import org.ays.auth.exception.AysUserAlreadyExistsByPhoneNumberException;
 import org.ays.auth.model.AdminRegistrationApplication;
@@ -26,8 +28,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 /**
  * Implementation of {@link AdminRegistrationCompleteService} that handles the completion of admin registration applications.
  * This service manages the creation of new admin users and assigns appropriate roles and permissions.
@@ -83,7 +83,7 @@ public void complete(final String id, final AdminRegistrationApplicationComplete
         final AdminRegistrationApplication application = adminRegistrationApplicationReadPort
                 .findById(id)
                 .filter(AdminRegistrationApplication::isWaiting)
-                .orElseThrow(() -> new AysAdminRegistrationApplicationNotExistByIdAuthException(id));
+                .orElseThrow(() -> new AysAdminRegistrationApplicationNotExistByIdException(id));
 
         user.setInstitution(application.getInstitution());
         user.notVerify();
diff --git a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java
index 9eeae3458..efbeb4815 100644
--- a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java
+++ b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java
@@ -2,6 +2,7 @@
 
 import org.ays.AysRestControllerTest;
 import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException;
+import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException;
 import org.ays.auth.model.AdminRegistrationApplication;
 import org.ays.auth.model.AdminRegistrationApplicationBuilder;
 import org.ays.auth.model.enums.AdminRegistrationApplicationStatus;
diff --git a/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java b/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java
index 0f15df206..087fca3a2 100644
--- a/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java
+++ b/src/test/java/org/ays/auth/service/impl/AdminRegistrationCompleteServiceImplTest.java
@@ -1,7 +1,9 @@
 package org.ays.auth.service.impl;
 
+import java.util.List;
+import java.util.Optional;
 import org.ays.AysUnitTest;
-import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdAuthException;
+import org.ays.auth.exception.AysAdminRegistrationApplicationNotExistByIdException;
 import org.ays.auth.exception.AysUserAlreadyExistsByEmailAddressException;
 import org.ays.auth.exception.AysUserAlreadyExistsByPhoneNumberException;
 import org.ays.auth.model.AdminRegistrationApplication;
@@ -33,9 +35,6 @@
 import org.mockito.Mockito;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import java.util.List;
-import java.util.Optional;
-
 class AdminRegistrationCompleteServiceImplTest extends AysUnitTest {
 
     @InjectMocks
@@ -273,7 +272,7 @@ void givenValidApplicationId_whenApplicationNotFound_thenThrowAdminRegistrationA
 
         // Then
         Assertions.assertThrows(
-                AysAdminRegistrationApplicationNotExistByIdAuthException.class,
+                AysAdminRegistrationApplicationNotExistByIdException.class,
                 () -> adminUserRegisterService.complete(mockApplicationId, mockCompleteRequest)
         );
 
@@ -336,7 +335,7 @@ void givenUsedApplicationId_whenApplicationStatusIsNotWaiting_thenThrowAdminRegi
 
         // Then
         Assertions.assertThrows(
-                AysAdminRegistrationApplicationNotExistByIdAuthException.class,
+                AysAdminRegistrationApplicationNotExistByIdException.class,
                 () -> adminUserRegisterService.complete(mockApplicationId, mockCompleteRequest)
         );