diff --git a/src/api/ApiCall.jsx b/src/api/ApiCall.jsx
index fa953247204c..b8a38648769a 100644
--- a/src/api/ApiCall.jsx
+++ b/src/api/ApiCall.jsx
@@ -16,6 +16,8 @@ export function ApiGetCall(props) {
     bulkRequest = false,
     toast = false,
     onResult,
+    staleTime = 600000, // 10 minutes
+    refetchOnWindowFocus = false,
   } = props;
   const queryClient = useQueryClient();
   const dispatch = useDispatch();
@@ -93,8 +95,8 @@ export function ApiGetCall(props) {
         return response.data;
       }
     },
-    staleTime: 600000, // 10 minutes
-    refetchOnWindowFocus: false,
+    staleTime: staleTime,
+    refetchOnWindowFocus: refetchOnWindowFocus,
     retry: retryFn,
   });
   return queryInfo;
diff --git a/src/components/CippComponents/CippSettingsSideBar.jsx b/src/components/CippComponents/CippSettingsSideBar.jsx
index 14c3ede87846..cb08993a8ea1 100644
--- a/src/components/CippComponents/CippSettingsSideBar.jsx
+++ b/src/components/CippComponents/CippSettingsSideBar.jsx
@@ -21,6 +21,9 @@ export const CippSettingsSideBar = (props) => {
 
   const currentUser = ApiGetCall({
     url: "/.auth/me",
+    queryKey: "authmecipp",
+    staleTime: 120000,
+    refetchOnWindowFocus: true,
   });
 
   const saveSettingsPost = ApiPostCall({
diff --git a/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx b/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx
index 179f057db2d2..53ed74c6e822 100644
--- a/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx
+++ b/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx
@@ -89,6 +89,7 @@ const CippIntegrationSettings = ({ children }) => {
       Tenant: selectedTenant.label,
       IntegrationName: selectedCompany.label,
       IntegrationId: selectedCompany.value,
+      TenantDomain: selectedTenant.addedFields.defaultDomainName,
     };
 
     setTableData([...tableData, newRowData]);
@@ -109,6 +110,7 @@ const CippIntegrationSettings = ({ children }) => {
         newTableData.push({
           TenantId: tenant.customerId,
           Tenant: tenant.displayName,
+          TenantDomain: tenant.defaultDomainName,
           IntegrationName: matchingCompany.name,
           IntegrationId: matchingCompany.value,
         });
@@ -237,7 +239,7 @@ const CippIntegrationSettings = ({ children }) => {
                 reportTitle={`${extension.id}-tenant-map`}
                 data={tableData}
                 simple={false}
-                simpleColumns={["Tenant", "IntegrationName"]}
+                simpleColumns={["IntegrationName", "Tenant", "TenantDomain"]}
                 isFetching={mappings.isFetching}
                 refreshFunction={() => mappings.refetch()}
               />
diff --git a/src/components/PrivateRoute.js b/src/components/PrivateRoute.js
index 4c77fa33627c..011886bc4499 100644
--- a/src/components/PrivateRoute.js
+++ b/src/components/PrivateRoute.js
@@ -5,13 +5,15 @@ export const PrivateRoute = ({ children, routeType }) => {
   const {
     data: profile,
     error,
-    isFetching,
+    isLoading,
   } = ApiGetCall({
     url: "/.auth/me",
     queryKey: "authmecipp",
+    refetchOnWindowFocus: true,
+    staleTime: 120000, // 2 minutes
   });
 
-  if (isFetching) {
+  if (isLoading) {
     return "Loading...";
   }
 
diff --git a/src/contexts/settings-context.js b/src/contexts/settings-context.js
index 76a29de26948..49b3eafedc6c 100644
--- a/src/contexts/settings-context.js
+++ b/src/contexts/settings-context.js
@@ -72,6 +72,7 @@ const initialSettings = {
   paletteMode: "light",
   pinNav: true,
   currentTenant: null,
+  showDevtools: false,
 };
 
 const initialState = {
diff --git a/src/layouts/account-popover.js b/src/layouts/account-popover.js
index a8682abefa70..ab6b9a11155b 100644
--- a/src/layouts/account-popover.js
+++ b/src/layouts/account-popover.js
@@ -9,7 +9,6 @@ import SunIcon from "@heroicons/react/24/outline/SunIcon";
 import {
   Avatar,
   Box,
-  FormControlLabel,
   List,
   ListItem,
   ListItemButton,
@@ -18,10 +17,8 @@ import {
   Popover,
   Stack,
   SvgIcon,
-  Switch,
   Typography,
   useMediaQuery,
-  IconButton,
 } from "@mui/material";
 import { usePopover } from "../hooks/use-popover";
 import { paths } from "../paths";
@@ -42,7 +39,9 @@ export const AccountPopover = (props) => {
 
   const orgData = ApiGetCall({
     url: "/.auth/me",
-    queryKey: "me",
+    queryKey: "authmecipp",
+    staleTime: 120000,
+    refetchOnWindowFocus: true,
   });
 
   const handleLogout = useCallback(async () => {
diff --git a/src/layouts/index.js b/src/layouts/index.js
index 33ffc87aa2eb..892e54e4c485 100644
--- a/src/layouts/index.js
+++ b/src/layouts/index.js
@@ -83,6 +83,8 @@ export const Layout = (props) => {
   const currentRole = ApiGetCall({
     url: "/.auth/me",
     queryKey: "authmecipp",
+    staleTime: 120000,
+    refetchOnWindowFocus: true,
   });
   const [hideSidebar, setHideSidebar] = useState(false);
 
diff --git a/src/pages/_app.js b/src/pages/_app.js
index e520d50c5822..69f35059554e 100644
--- a/src/pages/_app.js
+++ b/src/pages/_app.js
@@ -111,11 +111,11 @@ const App = (props) => {
                           />
                         </RTL>
                       </ThemeProvider>
-                      {settings?.showDevtools && (
+                      {settings.isInitialized && settings?.showDevtools === true ? (
                         <React.Suspense fallback={null}>
                           <ReactQueryDevtoolsProduction />
                         </React.Suspense>
-                      )}
+                      ) : null}
                     </>
                   );
                 }}
diff --git a/src/pages/unauthenticated.js b/src/pages/unauthenticated.js
index 6c06e2ca3a80..5543103d52d5 100644
--- a/src/pages/unauthenticated.js
+++ b/src/pages/unauthenticated.js
@@ -8,7 +8,9 @@ import { useState, useEffect } from "react";
 const Page = () => {
   const orgData = ApiGetCall({
     url: "/.auth/me",
-    queryKey: "me",
+    queryKey: "authmecipp",
+    staleTime: 120000,
+    refetchOnWindowFocus: true,
   });
   const blockedRoles = ["anonymous", "authenticated"];
   const [userRoles, setUserRoles] = useState([]);