diff --git a/src/app/App.tsx b/src/app/App.tsx
index 1921b322..c3cd0cc9 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1,6 +1,7 @@
 import { initSurvicate } from '../public-path';
 import { lazy, Suspense } from 'react';
 import React from 'react';
+import Cookies from 'js-cookie';
 import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from 'react-router-dom';
 import ChunkLoader from '@/components/loader/chunk-loader';
 import RoutePromptDialog from '@/components/route-prompt-dialog';
@@ -71,7 +72,14 @@ function App() {
     React.useEffect(() => {
         const accounts_list = localStorage.getItem('accountsList');
         const client_accounts = localStorage.getItem('clientAccounts');
-        const active_loginid = localStorage.getItem('active_loginid');
+        const active_loginid =
+            JSON.parse(Cookies.get('active_loginid') || '') || localStorage.getItem('active_loginid');
+        console.log('test from app', {
+            active_loginid,
+            active_login_id_encrypted: JSON.parse(Cookies.get('active_login_id_unencrypted') || ''),
+            active_loginid_cookie: Cookies.get('active_loginid') || '',
+            active_loginid_local_storage: localStorage.getItem('active_loginid'),
+        });
         const url_params = new URLSearchParams(window.location.search);
         const account_currency = url_params.get('account');
 
diff --git a/src/pages/callback/callback-page.tsx b/src/pages/callback/callback-page.tsx
index 9218a890..065b263d 100644
--- a/src/pages/callback/callback-page.tsx
+++ b/src/pages/callback/callback-page.tsx
@@ -1,3 +1,4 @@
+import Cookies from 'js-cookie';
 import { generateDerivApiInstance } from '@/external/bot-skeleton/services/api/appId';
 import { Callback } from '@deriv-com/auth-client';
 import { Button } from '@deriv-com/ui';
@@ -49,6 +50,12 @@ const CallbackPage = () => {
                     }
                 }
                 if (!is_token_set) {
+                    const active_loginid =
+                        JSON.parse(Cookies.get('active_loginid') || '') || localStorage.getItem('active_loginid');
+                    console.log('test from callback', {
+                        tokens,
+                        active_loginid,
+                    });
                     localStorage.setItem('authToken', tokens.token1);
                     localStorage.setItem('active_loginid', tokens.acct1);
                 }