diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
index 18489dca..07e4cb95 100644
--- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
+++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
@@ -62,8 +62,8 @@ public class AppController extends ControllerBase {
     public ApiResult<AppLoginVO> login(String userName, String password) {
         AppUser user = appUserService.getUser(userName, password);
         if (Objects.nonNull(user)) {
-            VUtils.trueThrowBusinessError(!PASSWORDENCODER.matches(password, user.getPassword()))
-                    .throwMessage(dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_INCORRECTUSERNAMEORPASSWORD, MultilingualUtil.getLanguage()));
+            VUtils.trueThrow(!PASSWORDENCODER.matches(password, user.getPassword()))
+                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_INCORRECTUSERNAMEORPASSWORD, MultilingualUtil.getLanguage()));
             VUtils.trueThrow(Objects.equals(user.getState(), UserState.Disabled.getState()))
                     .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, user.getLanguageCode()));
             VUtils.trueThrow(Objects.equals(user.getState(), UserState.ToBeActivated.getState()))
@@ -89,6 +89,8 @@ public class AppController extends ControllerBase {
                     .setPlatform(Constant.FROM_APP));
         } else {
             AdminUser adminUser = adminUserService.getUser(userName, password);
+            VUtils.trueThrow(Objects.isNull(adminUser))
+                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_INCORRECTUSERNAMEORPASSWORD, MultilingualUtil.getLanguage()));
             VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState()))
                     .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage()));
             VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState()))