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 4df608e..426e649 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
@@ -316,10 +316,11 @@ public class ContextInfoBuilderAspect {
 		}
 		if (LegacyGuessMissedRsp.ST_GUESS_OK.equals(rsp.getGuessTerminal())) {
 			contextInfo.setTerminalInfo(
-					new TerminalInfo(contextInfo.getTerminalInfo().getRawTerminalString(), rsp.getGuessTerminal()));
+					new TerminalInfo(rsp.getNewTerminal()));
 		}
 		if (LegacyGuessMissedRsp.ST_GUESS_OK.equals(rsp.getGuessWorkspace())) {
 			contextInfo.setWorkspaceId(rsp.getWorkspaceId());
+			contextInfo.setWorkspaceType(rsp.getWorkspaceType());
 		}
 		if (LegacyGuessMissedRsp.ST_GUESS_OK.equals(rsp.getGuessOU())) {
 			contextInfo.setOuId(rsp.getOuId());