diff --git a/client/pages/login.vue b/client/pages/login.vue
index 5d447ed9..a9d44561 100644
--- a/client/pages/login.vue
+++ b/client/pages/login.vue
@@ -305,8 +305,8 @@ export default {
   },
   async mounted() {
     // Token passed as query parameter after successful oidc login
-    if (this.$route.query?.setToken) {
-      localStorage.setItem('token', this.$route.query.setToken)
+    if (this.$route.query?.accessToken) {
+      localStorage.setItem('token', this.$route.query.accessToken)
     }
     if (localStorage.getItem('token')) {
       if (await this.checkAuth()) return // if valid user no need to check status
diff --git a/server/Auth.js b/server/Auth.js
index 601fe8f2..1d229ceb 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -266,7 +266,8 @@ class Auth {
       if (req.cookies.auth_cb) {
         let stateQuery = req.cookies.auth_state ? `&state=${req.cookies.auth_state}` : ''
         // UI request -> redirect to auth_cb url and send the jwt token as parameter
-        res.redirect(302, `${req.cookies.auth_cb}?setToken=${userResponse.user.accessToken}${stateQuery}`)
+        // TODO: Temporarily continue sending the old token as setToken
+        res.redirect(302, `${req.cookies.auth_cb}?setToken=${userResponse.user.token}&accessToken=${userResponse.user.accessToken}${stateQuery}`)
       } else {
         res.status(400).send('No callback or already expired')
       }