diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
index 6f5cbf1..060ca55 100644
--- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
+++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
@@ -295,7 +295,6 @@ public class ContextInfoBuilderAspect {
 		BeanUtil.fillBeanWithMap(userinfoMap, userInfo, false);
 
 		contextInfo.setUserInfo(userInfo);
-		contextInfo.getSystemAndDeviceInfo().setLoginDevice(contextInfo.getTerminalInfo().getSimpleTerminal());
 		try {
 			if(userinfoMap.containsKey("ouType"))
 				contextInfo.setOuType(Integer.parseInt(userinfoMap.get("ouType").toString()));
@@ -310,6 +309,7 @@ public class ContextInfoBuilderAspect {
 
 		try {
 			fillLegacyGuess(contextInfo, userinfoMap);
+			contextInfo.getSystemAndDeviceInfo().setLoginDevice(contextInfo.getTerminalInfo().getSimpleTerminal());
 		} catch (Exception e) {
 			log.warn("fill legacy guess error for user identityId=" + userInfo.getIdentityId(), e);
 		}