diff --git a/src/components/AnakinHeader.vue b/src/components/AnakinHeader.vue
index 8067b15..9626d04 100644
--- a/src/components/AnakinHeader.vue
+++ b/src/components/AnakinHeader.vue
@@ -40,7 +40,7 @@ watch(namespace, (ns) => {
       name: 'FinetuneExperimentList',
       params: { ns },
     });
-  } else {
+  } else if (ns) {
     router.push({
       ...route,
       params: { ns },
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index db96915..2a3a8fe 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { useUserStore } from '@/stores/user';
+import { RouteLocation } from 'vue-router';
 import { object, string } from 'yup';
 
 const router = useRouter();
@@ -23,10 +24,10 @@ const { handleSubmit } = useForm<ServiceAccount>({
 
 const onSubmit = handleSubmit(async (values) => {
   await userStore.login(values.token);
-  const redirectedPath = route.redirectedFrom?.fullPath;
+  const redirected = route.redirectedFrom as RouteLocation;
 
-  if (redirectedPath) {
-    router.push(redirectedPath);
+  if (redirected && redirected.name) {
+    router.push(redirected);
   } else {
     router.push({
       name: 'ConsoleContainer',