diff --git a/packages/ui/certd-client/src/router/guard.ts b/packages/ui/certd-client/src/router/guard.ts
index 846147968..c18941595 100644
--- a/packages/ui/certd-client/src/router/guard.ts
+++ b/packages/ui/certd-client/src/router/guard.ts
@@ -101,6 +101,14 @@ function setupAccessGuard(router: Router) {
       return r.meta?.auth || r.meta?.permission;
     });
 
+    if (to.path === LOGIN_PATH && accessStore.accessToken) {
+      return {
+        path: DEFAULT_HOME_PATH,
+        // 携带当前跳转的页面，登录后重新跳转该页面
+        replace: true,
+      };
+    }
+
     if (!needAuth) {
       return true;
     }
diff --git a/packages/ui/certd-client/src/views/framework/login/index.vue b/packages/ui/certd-client/src/views/framework/login/index.vue
index fb5af7454..4b447d842 100644
--- a/packages/ui/certd-client/src/views/framework/login/index.vue
+++ b/packages/ui/certd-client/src/views/framework/login/index.vue
@@ -113,12 +113,7 @@ export default defineComponent({
   setup() {
     const { t } = useI18n();
     const route = useRoute();
-    const router = useRouter();
     const userStore = useUserStore();
-    if (userStore.getToken) {
-      router.push("/");
-      return;
-    }
 
     const queryBindCode = ref(route.query.bindCode as string | undefined);
 
@@ -256,6 +251,7 @@ export default defineComponent({
       }
       return sysPublicSettings.oauthOnly && settingStore.isPlus && sysPublicSettings.oauthEnabled;
     });
+
     return {
       t,
       loading,