diff --git a/web/src/components/layout/header/Navbar.vue b/web/src/components/layout/header/Navbar.vue
index f4092a1c7a..59a869ba75 100644
--- a/web/src/components/layout/header/Navbar.vue
+++ b/web/src/components/layout/header/Navbar.vue
@@ -31,7 +31,7 @@
       <IconButton v-if="user" :to="{ name: 'user' }" :title="$t('user.settings.settings')" class="navbar-icon !p-1.5">
         <img v-if="user && user.avatar_url" class="rounded-md" :src="`${user.avatar_url}`" />
       </IconButton>
-      <Button v-else :text="$t('login')" @click="doLogin" />
+      <Button v-else :text="$t('login')" :to="`/login?url=${route.fullPath}`" />
     </div>
   </nav>
 </template>
@@ -55,10 +55,6 @@ const authentication = useAuthentication();
 const { user } = authentication;
 const apiUrl = `${config.rootPath ?? ''}/swagger/index.html`;
 
-function doLogin() {
-  authentication.authenticate(route.fullPath);
-}
-
 const { enableSwagger } = config;
 </script>
 
diff --git a/web/src/compositions/useAuthentication.ts b/web/src/compositions/useAuthentication.ts
index 35e6b510e2..8ca3df5638 100644
--- a/web/src/compositions/useAuthentication.ts
+++ b/web/src/compositions/useAuthentication.ts
@@ -12,6 +12,6 @@ export default () =>
         const config = useUserConfig();
         config.setUserConfig('redirectUrl', url);
       }
-      window.location.href = `${useConfig().rootPath}/authorize?forge_id=${forgeId}`;
+      window.location.href = `${useConfig().rootPath}/authorize?${forgeId !== undefined ? `forgeId=${forgeId}` : ''}`;
     },
   }) as const;