diff --git a/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx b/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx
index 57e44fa69c4..0355a897329 100644
--- a/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx
@@ -281,7 +281,7 @@ const openIdProviders: (OpenIdProviderOption | typeof Menu.line)[] = [
     {
       label: 'Microsoft Entra',
       value: 'microsoft',
-      issuer: 'https://login.microsoftonline.com/common/v2.0/',
+      issuer: 'https://login.microsoftonline.com/{tenant-id}',
       clientIdRequired: true,
       clientSecretRequired: true,
       clientSecretDisabled: false,
diff --git a/packages/desktop-electron/index.ts b/packages/desktop-electron/index.ts
index fde3fd2d08b..3a910e05573 100644
--- a/packages/desktop-electron/index.ts
+++ b/packages/desktop-electron/index.ts
@@ -72,7 +72,11 @@ const createOAuthServer = async () => {
 
       const code = query.get('token');
       if (code && clientWin) {
-        clientWin.loadURL(`http://localhost:3001/openid-cb?token=${code}`);
+        if (isDev) {
+          clientWin.loadURL(`http://localhost:3001/openid-cb?token=${code}`);
+        } else {
+          clientWin.loadURL(`app://actual/openid-cb?token=${code}`);
+        }
 
         // Respond to the browser
         res.writeHead(200, { 'Content-Type': 'text/plain' });