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 f98bf7e3..10f27903 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
@@ -63,10 +63,6 @@ public class AppController extends ControllerBase {
                     .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage()));
             VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState()))
                     .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_HAS_EXPIRED, MultilingualUtil.getLanguage()));
-            SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig
-                    .setExtra("from", Constant.FROM_ADMIN)
-                    .setExtra("name", adminUser.getUserName())
-                    .setExtra("email", adminUser.getEmail()));
             List<RoleVO> roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId());
             SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig
                     .setExtra("from", Constant.FROM_ADMIN)
@@ -74,11 +70,16 @@ public class AppController extends ControllerBase {
                     .setExtra("code", adminUser.getUserCode())
                     .setExtra("email", adminUser.getEmail())
                     .setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList())));
+            String adminToken=SaTokenAdminUtil.getTokenInfo().getTokenValue();
+            SaTokenAppUtil.login(adminUser.getId(), SaLoginConfig
+                    .setExtra("from", Constant.FROM_ADMIN)
+                    .setExtra("name", adminUser.getUserName())
+                    .setExtra("email", adminUser.getEmail()));
             SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo();
             return ApiResult.success(new AppLoginVO()
                     .setUserId(adminUser.getId())
                     .setToken(tokenInfo.getTokenValue())
-                    .setAdminToken(SaTokenAdminUtil.getTokenInfo().getTokenValue())
+                    .setAdminToken(adminToken)
                     .setExpire(tokenInfo.getTokenTimeout())
                     .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
                     .setPlatform(Constant.FROM_ADMIN));