diff --git a/src/payloads/login.ts b/src/payloads/login.ts
index c0ccf7bd..66039ac3 100644
--- a/src/payloads/login.ts
+++ b/src/payloads/login.ts
@@ -1,7 +1,6 @@
 export const loginLolliPopRedirect: string = "/idp-login";
-export const redirectUrl: string = "/profile.html?token=";
-export const errorCodeRedirectUrl: string = "/error.html?errorCode=";
-export const errorMessageRedirectUrl: string = "/error.html?errorMessage=";
+export const redirectUrl: string = "/profile.html";
+export const errorRedirectUrl: string = "/error.html";
 
 export enum AppUrlLoginScheme {
   native = "iologin",
diff --git a/src/routers/__tests__/server.test.ts b/src/routers/__tests__/server.test.ts
index 9bd0bf19..5b606bbf 100644
--- a/src/routers/__tests__/server.test.ts
+++ b/src/routers/__tests__/server.test.ts
@@ -19,14 +19,15 @@ it("login should response with a welcome page", async () => {
   expect(response.status).toBe(302);
 });
 
-it("login with auth should response with a redirect and the token as param", async () => {
+it("login with auth should response with a redirect and the token as param and fragment", async () => {
   const response = await request.get("/idp-login?authorized=1");
   const hostAndPort = response.text.match(/\/\/(.*?)\//);
+  const token = getLoginSessionToken();
   expect(response.status).toBe(302);
   expect(response.text).toBe(
     `Found. Redirecting to ${AppUrlLoginScheme.webview}://${
       hostAndPort ? hostAndPort[1] : ""
-    }/profile.html?token=${getLoginSessionToken()}`
+    }/profile.html?token=${token}#token=${token}`
   );
 });
 
diff --git a/src/routers/public.ts b/src/routers/public.ts
index 4f99535a..1a480044 100644
--- a/src/routers/public.ts
+++ b/src/routers/public.ts
@@ -13,8 +13,7 @@ import { WALLET_PAYMENT_PATH } from "../features/payments/utils/payment";
 import { backendInfo } from "../payloads/backend";
 import {
   AppUrlLoginScheme,
-  errorCodeRedirectUrl,
-  errorMessageRedirectUrl,
+  errorRedirectUrl,
   loginLolliPopRedirect,
   redirectUrl
 } from "../payloads/login";
@@ -101,29 +100,39 @@ addHandler(publicRouter, "get", "/idp-login", (req, res) => {
     ? AppUrlLoginScheme.native
     : AppUrlLoginScheme.webview;
 
+  const baseURL = `${urlLoginScheme}://${req.headers.host}`;
+
   if (req.query.authorized === "1" || ioDevServerConfig.global.autoLogin) {
     concretizeEphemeralInfo();
     createOrRefreshEverySessionToken();
-    const url = `${urlLoginScheme}://${
-      req.headers.host
-    }${redirectUrl}${getLoginSessionToken()}`;
+
+    const token = getLoginSessionToken() ?? "";
+    const urlInstance = new URL(redirectUrl, baseURL);
+    // eslint-disable-next-line functional/immutable-data
+    urlInstance.searchParams.append("token", token);
+    // eslint-disable-next-line functional/immutable-data
+    urlInstance.hash = `token=${token}`;
+
+    const url = urlInstance.toString();
     res.redirect(url);
     return;
   }
   if (req.query.error && typeof req.query.error === "string") {
     clearEphemeralLollipopInfo();
-    // eslint-disable-next-line functional/no-let
-    let redirectUrl;
-    // eslint-disable-next-line functional/no-let
-    let errorCodeOrMessage;
+
+    const urlInstance = new URL(errorRedirectUrl, baseURL);
+
     if (req.query.error.includes("errorMessage:")) {
-      redirectUrl = errorMessageRedirectUrl;
-      errorCodeOrMessage = req.query.error.split(":")[1];
+      const errorMessage = req.query.error.split(":")[1];
+      // eslint-disable-next-line functional/immutable-data
+      urlInstance.searchParams.append("errorMessage", errorMessage);
     } else {
-      redirectUrl = errorCodeRedirectUrl;
-      errorCodeOrMessage = req.query.error;
+      const errorCode = req.query.error;
+      // eslint-disable-next-line functional/immutable-data
+      urlInstance.searchParams.append("errorCode", errorCode);
     }
-    const url = `${urlLoginScheme}://${req.headers.host}${redirectUrl}${errorCodeOrMessage}`;
+
+    const url = urlInstance.toString();
     res.redirect(url);
     return;
   }