diff --git a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
index 471f20048..8d07d4277 100644
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -279,15 +279,18 @@ function createOpenVsCodeDialogButton(container: Explorer): CommandButtonCompone
 }
 
 function createLoginForEntraIDButton(container: Explorer): CommandButtonComponentProps {
-  if (configContext.platform !== Platform.Portal) {
-    return undefined;
-  }
+  // if (configContext.platform !== Platform.Portal) {
+  //   return undefined;
+  // }
 
   const handleCommandClick = async () => {
     await container.openLoginForEntraIDPopUp();
     useDataPlaneRbac.setState({ dataPlaneRbacEnabled: true });
   };
 
+  console.log("is dataplane rbac enabled", userContext.dataPlaneRbacEnabled);
+  console.log("aad token", userContext.aadToken);
+
   if (!userContext.dataPlaneRbacEnabled || userContext.aadToken) {
     return undefined;
   }
diff --git a/src/Utils/AuthorizationUtils.ts b/src/Utils/AuthorizationUtils.ts
index 26dcd5d5d..4ce1d3d45 100644
--- a/src/Utils/AuthorizationUtils.ts
+++ b/src/Utils/AuthorizationUtils.ts
@@ -58,6 +58,7 @@ export async function getMsalInstance() {
     auth: {
       authority: `${configContext.AAD_ENDPOINT}organizations`,
       clientId: "203f1145-856a-4232-83d4-a43568fba23d",
+      knownAuthorities: [configContext.AAD_ENDPOINT],
     },
   };
 
@@ -84,14 +85,16 @@ export async function acquireMsalTokenForAccount(
     hrefEndpoint = new URL(userContext.databaseAccount.properties.documentEndpoint).href.replace(/\/+$/, "/.default");
   }
   const msalInstance = await getMsalInstance();
+  console.log("msalInstance", msalInstance);
   const knownAccounts = msalInstance.getAllAccounts();
+  console.log("knownAccounts", knownAccounts);
   // If user_hint is provided, we will try to use it to find the account.
   // If no account is found, we will use the current active account or first account in the list.
   const msalAccount =
     knownAccounts?.filter((account) => account.username === user_hint)[0] ??
     msalInstance.getActiveAccount() ??
     knownAccounts?.[0];
-
+  console.log("msalAccount", msalAccount);
   if (!msalAccount) {
     // If no account was found, we need to sign in.
     // This will eventually throw InteractionRequiredAuthError if silent is true, we won't handle it here.
@@ -100,6 +103,7 @@ export async function acquireMsalTokenForAccount(
       loginHint: user_hint ?? userContext.userName,
       authority: userContext.tenantId ? `${configContext.AAD_ENDPOINT}${userContext.tenantId}` : undefined,
     };
+    console.log("loginRequest", loginRequest);
     try {
       if (silent) {
         // We can try to use SSO between different apps to avoid showing a popup.
@@ -163,7 +167,12 @@ export async function acquireTokenWithMsal(
     // attempt silent acquisition first
     return (await msalInstance.acquireTokenSilent(tokenRequest)).accessToken;
   } catch (silentError) {
-    if (silentError instanceof msal.InteractionRequiredAuthError && silent === false) {
+    console.log(silentError)
+    if (
+      (silentError instanceof msal.InteractionRequiredAuthError) &&
+      // (silentError instanceof msal.InteractionRequiredAuthError || silentError instanceof msal.AuthError) &&
+      silent === false
+    ) {
       try {
         // The error indicates that we need to acquire the token interactively.
         // This will display a pop-up to re-establish authorization. If user does not