diff --git a/src/services/html/login-popup.html b/src/services/html/login-popup.html
index fafc0c00e2..aa74adb015 100644
--- a/src/services/html/login-popup.html
+++ b/src/services/html/login-popup.html
@@ -1,10 +1,10 @@
-<div class="profile-popup">
+<div class="profile-popup login-profile-popup">
     <div class="popup-header">
         <h1 class="popup-title">{{Strings.PROFILE_POP_TITLE}}</h1>
         {{#trialInfo}}
         <div class="trial-plan-info">
             <span class="phoenix-pro-title-plain">
-                <span class="pro-plan-name">{{planName}}</span>
+                <span class="pro-plan-name user-plan-name">{{planName}}</span>
                 <i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
             </span>
         </div>
diff --git a/src/services/html/profile-popup.html b/src/services/html/profile-popup.html
index d555df5dac..03910e4087 100644
--- a/src/services/html/profile-popup.html
+++ b/src/services/html/profile-popup.html
@@ -1,4 +1,4 @@
-<div class="profile-popup">
+<div class="profile-popup user-profile-popup">
     <div class="popup-header">
         <div class="user-profile-header">
             <div class="user-avatar" style="background-color: {{avatarColor}};">
diff --git a/src/services/login-browser.js b/src/services/login-browser.js
index 159d754f7b..abe11bb340 100644
--- a/src/services/login-browser.js
+++ b/src/services/login-browser.js
@@ -344,6 +344,7 @@ define(function (require, exports, module) {
 
             // Always reset local state regardless of server response
             await _resetBrowserLogin();
+            await _verifyBrowserLogin();
 
             if (response.ok) {
                 const result = await response.json();
@@ -373,6 +374,7 @@ define(function (require, exports, module) {
         } catch (error) {
             // Always reset local state even on network error
             await _resetBrowserLogin();
+            await _verifyBrowserLogin();
             console.error("Network error during logout:", error);
             const dialog = Dialogs.showModalDialog(
                 DefaultDialogs.DIALOG_ID_ERROR,
diff --git a/src/services/login-desktop.js b/src/services/login-desktop.js
index 3a7be227a2..cadb7b5649 100644
--- a/src/services/login-desktop.js
+++ b/src/services/login-desktop.js
@@ -372,6 +372,7 @@ define(function (require, exports, module) {
                 return;
             }
             await _resetAccountLogin();
+            await _verifyLogin();
             Dialogs.showModalDialog(
                 DefaultDialogs.DIALOG_ID_INFO,
                 Strings.SIGNED_OUT,
diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js
index 81d61ceb88..7b918bc0c8 100644
--- a/src/services/profile-menu.js
+++ b/src/services/profile-menu.js
@@ -170,7 +170,7 @@ define(function (require, exports, module) {
                     effectiveEntitlements.trialDaysRemaining);
                 const trialInfoHtml = `<div class="trial-plan-info">
                     <span class="phoenix-pro-title-plain">
-                        <span class="pro-plan-name">${planName}</span>
+                        <span class="pro-plan-name user-plan-name">${planName}</span>
                         <i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
                     </span>
                 </div>`;
@@ -371,7 +371,7 @@ define(function (require, exports, module) {
                     const planName = StringUtils.format(Strings.PROMO_PRO_TRIAL_DAYS_LEFT,
                         entitlements.trialDaysRemaining);
                     const proTitle = `<span class="phoenix-pro-title-plain">
-                        <span class="pro-plan-name">${planName}</span>
+                        <span class="pro-plan-name user-plan-name">${planName}</span>
                         <i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
                     </span>`;
                     $planName.addClass('user-plan-paid').html(proTitle);
@@ -379,7 +379,7 @@ define(function (require, exports, module) {
                 } else {
                     // For paid users: regular plan name with icon
                     const proTitle = `<span class="phoenix-pro-title">
-                        <span class="pro-plan-name">${entitlements.plan.name}</span>
+                        <span class="pro-plan-name user-plan-name">${entitlements.plan.name}</span>
                         <i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
                     </span>`;
                     $planName.addClass('user-plan-paid').html(proTitle);
@@ -591,6 +591,7 @@ define(function (require, exports, module) {
                 _updateBranding(effectiveEntitlements);
             } else {
                 console.log('Profile Menu: No active trial found');
+                _updateBranding(null);
             }
         } catch (error) {
             console.error('Failed to initialize branding for trial users:', error);
diff --git a/test/spec/login-browser-integ-test.js b/test/spec/login-browser-integ-test.js
index d62f537b6a..61c6560736 100644
--- a/test/spec/login-browser-integ-test.js
+++ b/test/spec/login-browser-integ-test.js
@@ -37,6 +37,7 @@ define(function (require, exports, module) {
         let testWindow,
             LoginServiceExports,
             LoginBrowserExports,
+            ProDialogsExports,
             originalOpen,
             originalFetch;
 
@@ -47,7 +48,8 @@ define(function (require, exports, module) {
             await awaitsFor(
                 function () {
                     return testWindow._test_login_service_exports &&
-                           testWindow._test_login_browser_exports;
+                           testWindow._test_login_browser_exports &&
+                           testWindow._test_pro_dlg_login_exports;
                 },
                 "Test exports to be available",
                 5000
@@ -56,12 +58,11 @@ define(function (require, exports, module) {
             // Access the login service exports from the test window
             LoginServiceExports = testWindow._test_login_service_exports;
             LoginBrowserExports = testWindow._test_login_browser_exports;
+            ProDialogsExports = testWindow._test_pro_dlg_login_exports;
 
             // Store original functions for restoration
             originalOpen = testWindow.open;
-            if (LoginServiceExports.setFetchFn) {
-                originalFetch = testWindow.fetch;
-            }
+            originalFetch = testWindow.fetch;
 
             // Wait for profile menu to be initialized
             await awaitsFor(
@@ -75,23 +76,17 @@ define(function (require, exports, module) {
 
         afterAll(async function () {
             // Restore original functions
-            if (originalOpen) {
-                testWindow.open = originalOpen;
-            }
+            testWindow.open = originalOpen;
 
             // Restore all fetch function overrides
-            if (originalFetch) {
-                if (LoginServiceExports && LoginServiceExports.setFetchFn) {
-                    LoginServiceExports.setFetchFn(originalFetch);
-                }
-                if (LoginBrowserExports && LoginBrowserExports.setFetchFn) {
-                    LoginBrowserExports.setFetchFn(originalFetch);
-                }
-            }
+            LoginServiceExports.setFetchFn(originalFetch);
+            LoginBrowserExports.setFetchFn(originalFetch);
+            ProDialogsExports.setFetchFn(originalFetch);
 
             testWindow = null;
             LoginServiceExports = null;
             LoginBrowserExports = null;
+            ProDialogsExports = null;
             originalOpen = null;
             originalFetch = null;
             await SpecRunnerUtils.closeTestWindow();
@@ -102,289 +97,536 @@ define(function (require, exports, module) {
             // Note: We can't easily reset login state, so tests should handle this
         });
 
-        describe("Browser Login Flow", function () {
+        // Helper functions for promotion testing (browser-specific)
+        async function setupTrialState(daysRemaining) {
+            const PromotionExports = testWindow._test_promo_login_exports;
+            const mockNow = Date.now();
+            await PromotionExports._setTrialData({
+                proVersion: "3.1.0",
+                endDate: mockNow + (daysRemaining * PromotionExports.TRIAL_CONSTANTS.MS_PER_DAY)
+            });
+            // Trigger entitlements changed event to update branding
+            const LoginService = PromotionExports.LoginService;
+            LoginService.trigger(LoginService.EVENT_ENTITLEMENTS_CHANGED);
+        }
+
+        async function setupExpiredTrial() {
+            const PromotionExports = testWindow._test_promo_login_exports;
+            const mockNow = Date.now();
+            await PromotionExports._setTrialData({
+                proVersion: "3.1.0",
+                endDate: mockNow - PromotionExports.TRIAL_CONSTANTS.MS_PER_DAY
+            });
+            // Trigger entitlements changed event to update branding
+            const LoginService = PromotionExports.LoginService;
+            LoginService.trigger(LoginService.EVENT_ENTITLEMENTS_CHANGED);
+        }
+
+        function setupProUserMock(hasActiveSubscription = true) {
+            let userSignedOut = false;
+
+            // Set fetch mock on both browser and service exports
+            const fetchMock = (url, options) => {
+                console.log("llgT: browser promo test fetchFn called with URL:", url);
+
+                if (url.includes('/resolveBrowserSession')) {
+                    if (userSignedOut) {
+                        return Promise.resolve({
+                            ok: false,
+                            status: 401,
+                            json: () => Promise.resolve({ isSuccess: false })
+                        });
+                    }
+                    const response = {
+                        isSuccess: true,
+                        email: "prouser@example.com",
+                        firstName: "Pro",
+                        lastName: "User",
+                        customerID: "test-customer-id",
+                        loginTime: Date.now(),
+                        profileIcon: {
+                            initials: "TU",
+                            color: "#14b8a6"
+                        }
+                    };
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        json: () => Promise.resolve(response)
+                    });
+                } else if (url.includes('/getAppEntitlements')) {
+                    // Entitlements endpoint - return user's plan and entitlements
+                    console.log("llgT: Handling getAppEntitlements call");
+                    if (userSignedOut) {
+                        return Promise.resolve({
+                            ok: false,
+                            status: 401,
+                            json: () => Promise.resolve({ isSuccess: false })
+                        });
+                    } else {
+                        const entitlementsResponse = {
+                            isSuccess: true,
+                            lang: "en"
+                        };
+
+                        if (hasActiveSubscription) {
+                            entitlementsResponse.plan = {
+                                paidSubscriber: true,
+                                name: "Phoenix Pro",
+                                validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                            };
+                            entitlementsResponse.entitlements = {
+                                liveEdit: {
+                                    activated: true,
+                                    validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                                }
+                            };
+                        } else {
+                            entitlementsResponse.plan = {
+                                paidSubscriber: false,
+                                name: "Free Plan"
+                            };
+                        }
 
-            it("should complete browser login flow successfully", async function () {
-                // Ensure user starts logged out
-                const initialLoginState = LoginServiceExports.LoginService.isLoggedIn();
-                if (initialLoginState) {
-                    throw new Error("Login browser tests require user to be logged out. Please log out before running these tests.");
+                        return Promise.resolve({
+                            ok: true,
+                            status: 200,
+                            json: () => Promise.resolve(entitlementsResponse)
+                        });
+                    }
+                } else if (url.includes('/signOut')) {
+                    userSignedOut = true;
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        json: () => Promise.resolve({ isSuccess: true })
+                    });
+                } else {
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        json: () => Promise.resolve({ isSuccess: true })
+                    });
                 }
-                expect(initialLoginState).toBe(false);
+            };
 
-                // Step 1: Click profile icon to open login popup
-                const $profileButton = testWindow.$("#user-profile-button");
-                expect($profileButton.length).toBe(1);
+            // Apply fetch mock to both browser exports and login service exports
+            LoginBrowserExports.setFetchFn(fetchMock);
+            LoginServiceExports.setFetchFn(fetchMock);
+            ProDialogsExports.setFetchFn(fetchMock);
+        }
 
-                // Debug: Check if the button is visible and clickable
-                expect($profileButton.is(':visible')).toBe(true);
+        async function verifyProBranding(shouldShowPro, testDescription) {
+            const $brandingLink = testWindow.$("#phcode-io-main-nav");
+            console.log(`llgT: Browser verifying branding for ${testDescription}, shouldShowPro: ${shouldShowPro}`);
+            console.log(`llgT: Browser branding link classes: ${$brandingLink.attr('class')}`);
+            console.log(`llgT: Browser branding link text: '${$brandingLink.text()}'`);
 
-                // Try jQuery trigger first
-                $profileButton.trigger('click');
+            if (shouldShowPro) {
+                await awaitsFor(
+                    function () {
+                        return testWindow.$("#phcode-io-main-nav").hasClass("phoenix-pro");
+                    },
+                    `Verify Pro branding to appear: ${testDescription}`, 5000
+                );
+                expect($brandingLink.hasClass("phoenix-pro")).toBe(true);
+                expect($brandingLink.text()).toContain("Phoenix Pro");
+                expect($brandingLink.find(".fa-feather").length).toBe(1);
+            } else {
+                await awaitsFor(
+                    function () {
+                        return !testWindow.$("#phcode-io-main-nav").hasClass("phoenix-pro");
+                    },
+                    `Verify Pro branding to go away: ${testDescription}`, 5000
+                );
+                expect($brandingLink.hasClass("phoenix-pro")).toBe(false);
+                expect($brandingLink.text()).toBe("phcode.io");
+            }
+        }
+
+        const VIEW_TRIAL_DAYS_LEFT = "VIEW_TRIAL_DAYS_LEFT";
+        const VIEW_PHOENIX_PRO = "VIEW_PHOENIX_PRO";
+        const VIEW_PHOENIX_FREE = "VIEW_PHOENIX_FREE";
+        async function verifyProfilePopupContent(expectedView, testDescription) {
+            await awaitsFor(
+                function () {
+                    return testWindow.$('.profile-popup').length > 0;
+                },
+                `Profile popup to appear: ${testDescription}`,
+                3000
+            );
 
-                // Step 2: Wait for login popup to appear (check both modal and profile-popup)
+            if (expectedView === VIEW_PHOENIX_PRO) {
+                await awaitsFor(
+                    function () {
+                        const $popup = testWindow.$('.profile-popup');
+                        const $planName = $popup.find('.user-plan-name');
+                        const planText = $planName.text();
+                        return planText.includes("Phoenix Pro");
+                    },
+                    `Profile popup should say phoenix pro: ${testDescription}`, 5000
+                );
+                const $popup = testWindow.$('.profile-popup');
+                const $planName = $popup.find('.user-plan-name');
+                const planText = $planName.text();
+                expect(planText).toContain("Phoenix Pro");
+                expect(planText).not.toContain("days left");
+                expect($popup.find(".fa-feather").length).toBe(1);
+            } else if (expectedView === VIEW_TRIAL_DAYS_LEFT) {
+                await awaitsFor(
+                    function () {
+                        const $popup = testWindow.$('.profile-popup');
+                        const $planName = $popup.find('.user-plan-name');
+                        const planText = $planName.text();
+                        return planText.includes("Phoenix Pro") && planText.includes("days left");
+                    },
+                    `Profile popup should say phoenix pro trial: ${testDescription}`, 5000
+                );
+                const $popup = testWindow.$('.profile-popup');
+                const $planName = $popup.find('.user-plan-name');
+                const planText = $planName.text();
+                expect(planText).toContain("Phoenix Pro");
+                expect(planText).toContain("days left");
+                expect($popup.find(".fa-feather").length).toBe(1);
+            } else {
                 await awaitsFor(
                     function () {
-                        return testWindow.$('.modal').length > 0 || testWindow.$('.profile-popup').length > 0;
+                        const $popup = testWindow.$('.profile-popup');
+                        const $planName = $popup.find('.user-plan-name');
+                        const planText = $planName.text();
+                        return !planText.includes("Phoenix Pro");
                     },
-                    "Login popup to appear",
-                    3000
+                    `Profile popup should not say phoenix pro: ${testDescription}`, 5000
                 );
+                const $popup = testWindow.$('.profile-popup');
+                const $planName = $popup.find('.user-plan-name');
+                const planText = $planName.text();
+                expect(planText).not.toContain("Phoenix Pro");
+                expect($popup.find(".fa-feather").length).toBe(0);
+            }
+        }
 
-                // Get the popup content (could be modal or profile-popup)
-                let popupContent = testWindow.$('.modal');
-                if (popupContent.length === 0) {
-                    popupContent = testWindow.$('.profile-popup');
-                }
-                expect(testWindow.$('.profile-popup').is(':visible')).toBe(true);
+        async function cleanupTrialState() {
+            const PromotionExports = testWindow._test_promo_login_exports;
+            await PromotionExports._cleanTrialData();
+        }
 
-                // Verify it's the login popup (contains sign in button)
-                const signInButton = popupContent.find('#phoenix-signin-btn');
-                expect(signInButton.length).toBe(1);
-                expect(signInButton.text().trim().toLocaleLowerCase()).toContain('sign in');
-
-                // Step 3: Mock successful login response FIRST (using login-browser test exports)
-                console.log("llgT: Setting up fetch mock EARLY using login-browser exports");
-                console.log("llgT: LoginBrowserExports.setFetchFn available?", !!LoginBrowserExports.setFetchFn);
-
-                if (LoginBrowserExports.setFetchFn) {
-                    // Track sign out state for proper mock responses
-                    let userSignedOut = false;
-
-                    LoginBrowserExports.setFetchFn((url, options) => {
-                        console.log("llgT: login-browser fetchFn called with URL:", url);
-                        console.log("llgT: login-browser fetchFn called with options:", options);
-
-                        // Handle different endpoints
-                        if (url.includes('/resolveBrowserSession')) {
-                            // Login verification endpoint
-                            if (userSignedOut) {
-                                console.log("llgT: User is signed out, returning 401 for resolveBrowserSession");
-                                return Promise.resolve({
-                                    ok: false,
-                                    status: 401, // Unauthorized - user is logged out
-                                    json: () => Promise.resolve({
-                                        isSuccess: false
-                                    })
-                                });
-                            } else {
-                                console.log("llgT: User is signed in, returning success for resolveBrowserSession");
-                                return Promise.resolve({
-                                    ok: true,
-                                    status: 200,
-                                    json: () => Promise.resolve({
-                                        isSuccess: true,
-                                        email: "test@example.com",
-                                        firstName: "Test",
-                                        lastName: "User",
-                                        customerID: "test-customer-id",
-                                        loginTime: Date.now(),
-                                        profileIcon: {
-                                            initials: "TU",
-                                            color: "#14b8a6"
-                                        }
-                                    })
-                                });
-                            }
-                        } else if (url.includes('/signOut')) {
-                            // Logout endpoint - set signed out state
-                            console.log("llgT: Handling signOut endpoint call, marking user as signed out");
-                            userSignedOut = true;
-                            return Promise.resolve({
-                                ok: true,
-                                status: 200,
-                                json: () => Promise.resolve({
-                                    isSuccess: true
-                                })
-                            });
-                        } else {
-                            // Default response for any other endpoints
-                            console.log("llgT: Unknown endpoint, returning default response");
-                            return Promise.resolve({
-                                ok: true,
-                                status: 200,
-                                json: () => Promise.resolve({
-                                    isSuccess: true
-                                })
-                            });
-                        }
-                    });
-                    console.log("llgT: login-browser fetch mock set up successfully for all endpoints");
-                } else {
-                    console.log("llgT: LoginBrowserExports.setFetchFn not available!");
-                }
+        const SIGNIN_POPUP = "SIGNIN_POPUP";
+        const PROFILE_POPUP = "PROFILE_POPUP";
+        async function popupToAppear(popupType = SIGNIN_POPUP) {
+            const statusText = popupType === SIGNIN_POPUP ?
+                "Sign In popup to appear" : "Profile popup to appear";
+            await awaitsFor(
+                function () {
+                    const selector = popupType === SIGNIN_POPUP ? ".login-profile-popup" : ".user-profile-popup";
+                    return testWindow.$('.modal').length > 0 || testWindow.$(selector).length > 0;
+                },
+                statusText, 3000
+            );
+        }
 
-                // Step 4: Mock window.open to capture account URL opening
-                let capturedURL = null;
-                let capturedTarget = null;
-                testWindow.open = function(url, target) {
-                    capturedURL = url;
-                    capturedTarget = target;
-                    // Return a mock window object with focus method
-                    return {
-                        focus: function() {},
-                        close: function() {},
-                        closed: false
-                    };
+        async function performFullLoginFlow() {
+            // Mock window.open like the original test
+            let capturedURL = null;
+            let capturedTarget = null;
+            testWindow.open = function(url, target) {
+                capturedURL = url;
+                capturedTarget = target;
+                return {
+                    focus: function() {},
+                    close: function() {},
+                    closed: false
                 };
+            };
 
-                // Step 5: Click the sign in button
-                console.log("llgT: About to click sign in button");
-                signInButton.trigger('click');
+            // Click profile button
+            const $profileButton = testWindow.$("#user-profile-button");
+            $profileButton.trigger('click');
+            await popupToAppear(SIGNIN_POPUP);
 
-                // Verify window.open was called with the account URL
-                expect(capturedURL).toBeDefined();
-                expect(capturedURL).toContain('phcode.dev'); // Should contain account domain
-                expect(capturedTarget).toBe('_blank');
+            // Find and click sign in button
+            let popupContent = testWindow.$('.profile-popup');
+            const signInButton = popupContent.find('#phoenix-signin-btn');
+            signInButton.trigger('click');
 
-                // Step 6: Wait for login waiting dialog to appear
-                await testWindow.__PR.waitForModalDialog(".browser-login-waiting-dialog");
+            // Verify window.open was called
+            expect(capturedURL).toBeDefined();
+            expect(capturedURL).toContain('phcode.dev');
+            expect(capturedTarget).toBe('_blank');
 
-                // Get waiting dialog content
-                console.log("llgT: Looking for waiting dialog...");
-                let waitingDialog = testWindow.$('.modal');
-                if (waitingDialog.length === 0) {
-                    // Look for the waiting dialog by its unique button
-                    waitingDialog = testWindow.$('[data-button-id="check"]').closest('div');
-                }
-                console.log("llgT: Waiting dialog found:", waitingDialog.length);
-                expect(waitingDialog.length).toBeGreaterThan(0);
+            // Wait for browser login waiting dialog
+            await testWindow.__PR.waitForModalDialog(".browser-login-waiting-dialog");
+
+            // Click "Check Now" button to verify login
+            const checkNowButton = testWindow.$('[data-button-id="check"]');
+            checkNowButton.trigger('click');
+
+            // Wait for login to complete
+            await awaitsFor(
+                function () {
+                    return LoginServiceExports.LoginService.isLoggedIn();
+                },
+                "User to be logged in",
+                5000
+            );
+
+            // Wait for login dialog to close
+            await testWindow.__PR.waitForModalDialogClosed(".modal", "Login waiting dialog");
+
+            // Wait for profile icon to update with user data
+            await awaitsFor(
+                function () {
+                    const $profileIcon = testWindow.$("#user-profile-button");
+                    const profileIconContent = $profileIcon.html();
+                    return profileIconContent && profileIconContent.includes('TU');
+                },
+                "profile icon to update with user initials",
+                3000
+            );
+        }
 
-                // Verify waiting dialog content
-                const checkNowButton = testWindow.$('[data-button-id="check"]');
-                expect(checkNowButton.length).toBe(1);
-                expect(checkNowButton.text().trim()).toContain('Check Now');
+        function verifyProfileIconBlanked() {
+            const $profileIcon = testWindow.$("#user-profile-button");
+            const initialContent = $profileIcon.html();
+            expect(initialContent).not.toContain('TU');
+        }
 
-                // Step 7: Click "Check Now" button to verify login (in iframe testWindow)
-                // Click the Check Now button
-                console.log("llgT: Clicking Check Now button");
-                checkNowButton.trigger('click');
+        async function performFullLogoutFlow() {
+            // Click profile button to open popup
+            const $profileButton = testWindow.$("#user-profile-button");
+            $profileButton.trigger('click');
 
-                // Wait for login verification to complete and success message
-                await awaitsFor(
-                    function () {
-                        const isLoggedIn = LoginServiceExports.LoginService.isLoggedIn();
-                        if (isLoggedIn) {
-                            console.log("llgT: User is now logged in!");
-                        }
-                        return isLoggedIn;
-                    },
-                    "User to be logged in",
-                    5000
-                );
+            // Wait for profile popup
+            await popupToAppear(PROFILE_POPUP);
+
+            // Find and click sign out button
+            let popupContent = testWindow.$('.profile-popup');
+            const signOutButton = popupContent.find('#phoenix-signout-btn');
+            signOutButton.trigger('click');
+
+            // Wait for sign out confirmation dialog and dismiss it
+            await testWindow.__PR.waitForModalDialog(".modal");
+            testWindow.__PR.clickDialogButtonID(testWindow.__PR.Dialogs.DIALOG_BTN_OK);
+            await testWindow.__PR.waitForModalDialogClosed(".modal");
+
+            // Wait for sign out to complete
+            await awaitsFor(
+                function () {
+                    return !LoginServiceExports.LoginService.isLoggedIn();
+                },
+                "User to be signed out",
+                10000
+            );
+
+            verifyProfileIconBlanked();
+        }
+
+        describe("Browser Login Tests", function () {
+
+            beforeEach(async function () {
+                // Ensure clean state before each test
+                if (LoginServiceExports.LoginService.isLoggedIn()) {
+                    throw new Error("browser login tests require user to be logged out at start. Please log out before running these tests.");
+                }
+                await cleanupTrialState();
+            });
+
+            it("should complete login and logout flow", async function () {
+                // Setup basic user mock
+                setupProUserMock(false);
 
-                // Verify user is now logged in
+                // Perform full login flow
+                await performFullLoginFlow();
                 expect(LoginServiceExports.LoginService.isLoggedIn()).toBe(true);
 
-                // Verify profile icon has been updated with user initials
+                // Perform full logout flow
+                await performFullLogoutFlow();
+                expect(LoginServiceExports.LoginService.isLoggedIn()).toBe(false);
+            });
+
+            it("should update profile icon after login", async function () {
+                // Setup basic user mock
+                setupProUserMock(false);
+
+                // Verify initial state
+                verifyProfileIconBlanked();
+
+                // Perform login
+                await performFullLoginFlow();
+
+                // Verify profile icon updated with user initials
                 const $profileIcon = testWindow.$("#user-profile-button");
-                const profileIconContent = $profileIcon.html();
-                expect(profileIconContent).toContain('svg'); // Should contain SVG element
-                expect(profileIconContent).toContain('TU'); // Should contain user initials
+                const updatedContent = $profileIcon.html();
+                expect(updatedContent).toContain('svg');
+                expect(updatedContent).toContain('TU');
 
-                // Step 8: Wait for login dialog to close automatically (or close it manually)
-                await awaitsFor(
-                    function () {
-                        return testWindow.$('.modal:visible').length === 0 &&
-                               testWindow.$('[data-button-id="check"]:visible').length === 0;
-                    },
-                    "Login dialog to close",
-                    3000
-                );
+                // Logout for cleanup
+                await performFullLogoutFlow();
+            });
 
-                // Step 9: Click profile icon again to verify profile popup appears
+            it("should show correct popup states", async function () {
+                // Setup basic user mock
+                setupProUserMock(false);
+
+                const $profileButton = testWindow.$("#user-profile-button");
+
+                // Test initial state - should show signin popup
                 $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
 
-                // Wait for profile popup (not login popup) to appear
-                await awaitsFor(
-                    function () {
-                        return testWindow.$('.modal').length > 0 ||
-                               testWindow.$('.profile-popup').length > 0;
-                    },
-                    "Profile popup to appear",
-                    3000
-                );
+                let popupContent = testWindow.$('.profile-popup');
+                const signInButton = popupContent.find('#phoenix-signin-btn');
+                const signOutButton = popupContent.find('#phoenix-signout-btn');
 
-                // Get the new popup content
-                let newPopupContent = testWindow.$('.modal');
-                if (newPopupContent.length === 0) {
-                    newPopupContent = testWindow.$('.profile-popup');
-                }
+                expect(signInButton.length).toBe(1);
+                expect(signOutButton.length).toBe(0);
 
-                // Verify it's the profile popup (contains sign out button, not sign in)
-                const signOutButton = newPopupContent.find('#phoenix-signout-btn');
-                const newSignInButton = newPopupContent.find('#phoenix-signin-btn');
+                // Close popup
+                $profileButton.trigger('click');
 
-                expect(signOutButton.length).toBe(1); // Should have sign out button
-                expect(newSignInButton.length).toBe(0); // Should NOT have sign in button
+                // Perform login
+                await performFullLoginFlow();
 
-                // Step 10: Test sign out functionality
-                console.log("llgT: About to click sign out button");
-                console.log("llgT: Login state before sign out:", LoginServiceExports.LoginService.isLoggedIn());
+                // Test logged in state - should show profile popup
+                $profileButton.trigger('click');
+                await popupToAppear(PROFILE_POPUP);
 
-                signOutButton.trigger('click');
+                popupContent = testWindow.$('.profile-popup');
+                const newSignInButton = popupContent.find('#phoenix-signin-btn');
+                const newSignOutButton = popupContent.find('#phoenix-signout-btn');
 
-                // Wait for sign out dialog to appear and dismiss it
-                console.log("llgT: Waiting for sign out confirmation dialog");
-                await testWindow.__PR.waitForModalDialog(".modal");
+                expect(newSignInButton.length).toBe(0);
+                expect(newSignOutButton.length).toBe(1);
 
-                // Dismiss the "you have been signed out" dialog with OK button
-                console.log("llgT: Dismissing sign out confirmation dialog");
-                testWindow.__PR.clickDialogButtonID(testWindow.__PR.Dialogs.DIALOG_BTN_OK);
-                await testWindow.__PR.waitForModalDialogClosed(".modal");
+                // Close popup and logout for cleanup
+                $profileButton.trigger('click');
+                await performFullLogoutFlow();
 
-                // Wait for sign out to complete
-                console.log("llgT: Waiting for user to be signed out...");
-                await awaitsFor(
-                    function () {
-                        return !LoginServiceExports.LoginService.isLoggedIn();
-                    },
-                    "User to be signed out",
-                    10000 // Increase timeout to see if it's just taking longer
-                );
+                // Test final state - should be back to signin popup
+                $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
 
-                // Verify user is now signed out
-                expect(LoginServiceExports.LoginService.isLoggedIn()).toBe(false);
+                popupContent = testWindow.$('.profile-popup');
+                const finalSignInButton = popupContent.find('#phoenix-signin-btn');
+                const finalSignOutButton = popupContent.find('#phoenix-signout-btn');
 
-                // Verify profile icon has been updated (should be empty again)
-                const $profileIconAfterSignout = testWindow.$("#user-profile-button");
-                const profileIconContentAfterSignout = $profileIconAfterSignout.html();
-                console.log("llgT: Profile icon after signout:", profileIconContentAfterSignout);
+                expect(finalSignInButton.length).toBe(1);
+                expect(finalSignOutButton.length).toBe(0);
 
-                // Step 11: Verify clicking profile icon again shows login popup (not profile popup)
-                console.log("llgT: Clicking profile icon after sign out to verify login popup appears");
-                $profileIconAfterSignout.trigger('click');
+                // Close popup
+                $profileButton.trigger('click');
+            });
 
-                // Wait for login popup to appear again
-                await awaitsFor(
-                    function () {
-                        return testWindow.$('.modal').length > 0 || testWindow.$('.profile-popup').length > 0;
-                    },
-                    "Login popup to appear after signout",
-                    3000
-                );
+            it("should show pro branding for user with pro subscription (expired trial)", async function () {
+                console.log("llgT: Starting browser pro user with expired trial test");
 
-                // Get the popup content after signout
-                let finalPopupContent = testWindow.$('.modal');
-                if (finalPopupContent.length === 0) {
-                    finalPopupContent = testWindow.$('.profile-popup');
-                }
+                // Setup: Pro subscription + expired trial
+                setupProUserMock(true);
+                await setupExpiredTrial();
 
-                // Verify it's back to login popup (has sign in button, no sign out button)
-                const finalSignInButton = finalPopupContent.find('#phoenix-signin-btn');
-                const finalSignOutButton = finalPopupContent.find('#phoenix-signout-btn');
+                // Verify initial state (no pro branding)
+                await verifyProBranding(false, "no pro branding to start with");
 
-                expect(finalSignInButton.length).toBe(1); // Should have sign in button again
-                expect(finalSignOutButton.length).toBe(0); // Should NOT have sign out button
+                // Perform login
+                await performFullLoginFlow();
+                await verifyProBranding(true, "pro branding to appear after pro user login");
 
-                // Close the final popup
-                if (testWindow.$('.modal').length > 0) {
-                    testWindow.__PR.clickDialogButtonID(testWindow.__PR.Dialogs.DIALOG_BTN_CANCEL);
-                    await testWindow.__PR.waitForModalDialogClosed(".modal");
-                } else {
-                    // If it's not a modal, just click outside or use popup close method
-                    $profileIconAfterSignout.trigger('click'); // Toggle to close
-                }
+                // Check profile popup shows pro status (not trial)
+                const $profileButton = testWindow.$("#user-profile-button");
+                $profileButton.trigger('click');
+
+                // Wait for profile popup to show "phoenix pro <leaf>"
+                await verifyProfilePopupContent(VIEW_PHOENIX_PRO, "pro user profile popup");
+
+                // Close popup
+                $profileButton.trigger('click');
+
+                // Perform logout
+                await performFullLogoutFlow();
+
+                // For user with pro subscription + expired trial:
+                // After logout, pro branding should disappear because:
+                // 1. No server entitlements (logged out)
+                // 2. Trial is expired (0 days remaining)
+                await verifyProBranding(false, "Pro branding to disappear after logout");
+            });
+
+            it("should show trial branding for user without pro subscription (active trial)", async function () {
+                console.log("llgT: Starting browser trial user test");
+
+                // Setup: No pro subscription + active trial (15 days)
+                setupProUserMock(false);
+                await setupTrialState(15);
+
+                // Verify initial state shows pro branding due to trial
+                await verifyProBranding(true, "Trial branding to appear initially");
+
+                // Perform login
+                await performFullLoginFlow();
+
+                // Verify pro branding remains after login
+                await verifyProBranding(true, "after trial user login");
+
+                // Check profile popup shows trial status
+                const $profileButton = testWindow.$("#user-profile-button");
+                $profileButton.trigger('click');
+                await popupToAppear(PROFILE_POPUP);
+                await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                    "trial user profile popup for logged in user");
+
+                // Close popup
+                $profileButton.trigger('click');
+
+                // Perform logout
+                await performFullLogoutFlow();
+
+                // Verify pro branding remains after logout (trial continues)
+                await verifyProBranding(true, "Trial branding to remain after logout");
+
+                // Check profile popup still shows trial status
+                $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
+                await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                    "trial user profile popup for logged out user");
+
+                // Close popup
+                $profileButton.trigger('click');
+            });
+
+            it("should prioritize pro subscription over trial in profile popup", async function () {
+                console.log("llgT: Starting browser trial user with pro subscription test");
+
+                // Setup: Pro subscription + active trial
+                setupProUserMock(true);
+                await setupTrialState(10);
+
+                // Perform login
+                await performFullLoginFlow();
+
+                // Verify pro branding appears
+                await verifyProBranding(true, "Pro branding to appear for pro user");
+
+                // Check profile popup shows pro status (not trial text)
+                const $profileButton = testWindow.$("#user-profile-button");
+                $profileButton.trigger('click');
+                await popupToAppear(PROFILE_POPUP);
+
+                // Should show pro, not trial, since user has paid subscription
+                await verifyProfilePopupContent(VIEW_PHOENIX_PRO,
+                    "pro+trial user profile should not show trial branding");
+
+                // Close popup
+                $profileButton.trigger('click');
+
+                // Perform logout
+                await performFullLogoutFlow();
+
+                // Verify pro branding remains due to trial (even though subscription is gone)
+                await verifyProBranding(true, "Pro branding should remain after logout as trial user");
+                $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
+                await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                    "trial user profile popup for logged out user");
             });
         });
     });
diff --git a/test/spec/login-desktop-integ-test.js b/test/spec/login-desktop-integ-test.js
index 1db150cd00..49a599a510 100644
--- a/test/spec/login-desktop-integ-test.js
+++ b/test/spec/login-desktop-integ-test.js
@@ -44,6 +44,7 @@ define(function (require, exports, module) {
         let testWindow,
             LoginServiceExports,
             LoginDesktopExports,
+            ProDialogsExports,
             originalOpenURLInDefaultBrowser,
             originalCopyToClipboard,
             originalFetch;
@@ -64,15 +65,12 @@ define(function (require, exports, module) {
             // Access the login service exports from the test window
             LoginServiceExports = testWindow._test_login_service_exports;
             LoginDesktopExports = testWindow._test_login_desktop_exports;
+            ProDialogsExports = testWindow._test_pro_dlg_login_exports;
 
             // Store original functions for restoration
-            if (testWindow.Phoenix && testWindow.Phoenix.app) {
-                originalOpenURLInDefaultBrowser = testWindow.Phoenix.app.openURLInDefaultBrowser;
-                originalCopyToClipboard = testWindow.Phoenix.app.copyToClipboard;
-            }
-            if (LoginServiceExports.setFetchFn) {
-                originalFetch = testWindow.fetch;
-            }
+            originalOpenURLInDefaultBrowser = testWindow.Phoenix.app.openURLInDefaultBrowser;
+            originalCopyToClipboard = testWindow.Phoenix.app.copyToClipboard;
+            originalFetch = testWindow.fetch;
 
             // Wait for profile menu to be initialized
             await awaitsFor(
@@ -86,26 +84,18 @@ define(function (require, exports, module) {
 
         afterAll(async function () {
             // Restore original functions
-            if (originalOpenURLInDefaultBrowser && testWindow.Phoenix && testWindow.Phoenix.app) {
-                testWindow.Phoenix.app.openURLInDefaultBrowser = originalOpenURLInDefaultBrowser;
-            }
-            if (originalCopyToClipboard && testWindow.Phoenix && testWindow.Phoenix.app) {
-                testWindow.Phoenix.app.copyToClipboard = originalCopyToClipboard;
-            }
+            testWindow.Phoenix.app.openURLInDefaultBrowser = originalOpenURLInDefaultBrowser;
+            testWindow.Phoenix.app.copyToClipboard = originalCopyToClipboard;
 
             // Restore all fetch function overrides
-            if (originalFetch) {
-                if (LoginServiceExports && LoginServiceExports.setFetchFn) {
-                    LoginServiceExports.setFetchFn(originalFetch);
-                }
-                if (LoginDesktopExports && LoginDesktopExports.setFetchFn) {
-                    LoginDesktopExports.setFetchFn(originalFetch);
-                }
-            }
+            LoginDesktopExports.setFetchFn(originalFetch);
+            LoginServiceExports.setFetchFn(originalFetch);
+            ProDialogsExports.setFetchFn(originalFetch);
 
             testWindow = null;
             LoginServiceExports = null;
             LoginDesktopExports = null;
+            ProDialogsExports = null;
             originalOpenURLInDefaultBrowser = null;
             originalCopyToClipboard = null;
             originalFetch = null;
@@ -117,217 +107,416 @@ define(function (require, exports, module) {
             // Note: We can't easily reset login state, so tests should handle this
         });
 
-        describe("Desktop Login Flow", function () {
+        // Helper functions for desktop login testing
+        async function setupTrialState(daysRemaining) {
+            const PromotionExports = testWindow._test_promo_login_exports;
+            const mockNow = Date.now();
+            await PromotionExports._setTrialData({
+                proVersion: "3.1.0",
+                endDate: mockNow + (daysRemaining * PromotionExports.TRIAL_CONSTANTS.MS_PER_DAY)
+            });
+            // Trigger entitlements changed event to update branding
+            const LoginService = PromotionExports.LoginService;
+            LoginService.trigger(LoginService.EVENT_ENTITLEMENTS_CHANGED);
+        }
+
+        async function setupExpiredTrial() {
+            const PromotionExports = testWindow._test_promo_login_exports;
+            const mockNow = Date.now();
+            await PromotionExports._setTrialData({
+                proVersion: "3.1.0",
+                endDate: mockNow - PromotionExports.TRIAL_CONSTANTS.MS_PER_DAY
+            });
+            // Trigger entitlements changed event to update branding
+            const LoginService = PromotionExports.LoginService;
+            LoginService.trigger(LoginService.EVENT_ENTITLEMENTS_CHANGED);
+        }
+
+        function setupProUserMock(hasActiveSubscription = true) {
+            let userSignedOut = false;
+
+            // Set fetch mock on desktop exports
+            const fetchMock = (url, options) => {
+                console.log("llgT: desktop test fetchFn called with URL:", url);
+
+                if (url.includes('/getAppAuthSession')) {
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        json: () => Promise.resolve({
+                            isSuccess: true,
+                            appSessionID: "test-session-123",
+                            validationCode: "123456"
+                        })
+                    });
+                } else if (url.includes('/resolveAppSessionID')) {
+                    if (userSignedOut) {
+                        return Promise.resolve({
+                            ok: false,
+                            status: 401,
+                            json: () => Promise.resolve({ isSuccess: false })
+                        });
+                    }
+                    const response = {
+                        isSuccess: true,
+                        email: "prouser@example.com",
+                        firstName: "Pro",
+                        lastName: "User",
+                        customerID: "test-customer-id",
+                        apiKey: "test-api-key",
+                        validationCode: "123456",
+                        profileIcon: {
+                            initials: "TU",
+                            color: "#14b8a6"
+                        }
+                    };
+
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        json: () => Promise.resolve(response)
+                    });
+                } else if (url.includes('/getAppEntitlements')) {
+                    // Entitlements endpoint - return user's plan and entitlements
+                    console.log("llgT: Handling getAppEntitlements call");
+                    if (userSignedOut) {
+                        return Promise.resolve({
+                            ok: false,
+                            status: 401,
+                            json: () => Promise.resolve({ isSuccess: false })
+                        });
+                    } else {
+                        const entitlementsResponse = {
+                            isSuccess: true,
+                            lang: "en"
+                        };
+
+                        if (hasActiveSubscription) {
+                            entitlementsResponse.plan = {
+                                paidSubscriber: true,
+                                name: "Phoenix Pro",
+                                validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                            };
+                            entitlementsResponse.entitlements = {
+                                liveEdit: {
+                                    activated: true,
+                                    validTill: Date.now() + 30 * 24 * 60 * 60 * 1000
+                                }
+                            };
+                        } else {
+                            entitlementsResponse.plan = {
+                                paidSubscriber: false,
+                                name: "Free Plan"
+                            };
+                        }
 
-            it("should complete desktop login flow successfully", async function () {
-                // if this fails, it may fail on repeat as the test login creds are not reset.
-                // Ensure user starts logged out
-                const initialLoginState = LoginServiceExports.LoginService.isLoggedIn();
-                if (initialLoginState) {
-                    throw new Error("Login desktop tests require user to be logged out. Please log out before running these tests.");
+                        return Promise.resolve({
+                            ok: true,
+                            status: 200,
+                            json: () => Promise.resolve(entitlementsResponse)
+                        });
+                    }
+                } else if (url.includes('/signOut') || url.includes('/logoutSession')) {
+                    userSignedOut = true;
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        json: () => Promise.resolve({ isSuccess: true })
+                    });
+                } else {
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        json: () => Promise.resolve({ isSuccess: true })
+                    });
                 }
-                expect(initialLoginState).toBe(false);
+            };
 
-                // Step 1: Click profile icon to open login popup
-                const $profileButton = testWindow.$("#user-profile-button");
-                expect($profileButton.length).toBe(1);
+            // Apply fetch mock to desktop exports and login service exports
+            LoginDesktopExports.setFetchFn(fetchMock);
+            LoginServiceExports.setFetchFn(fetchMock);
+            ProDialogsExports.setFetchFn(fetchMock);
+        }
 
-                // Debug: Check if the button is visible and clickable
-                expect($profileButton.is(':visible')).toBe(true);
+        async function verifyProBranding(shouldShowPro, testDescription) {
+            const $brandingLink = testWindow.$("#phcode-io-main-nav");
+            console.log(`llgT: Desktop verifying branding for ${testDescription}, shouldShowPro: ${shouldShowPro}`);
+            console.log(`llgT: Desktop branding link classes: ${$brandingLink.attr('class')}`);
+            console.log(`llgT: Desktop branding link text: '${$brandingLink.text()}'`);
 
-                // Try jQuery trigger first
-                $profileButton.trigger('click');
+            if (shouldShowPro) {
+                await awaitsFor(
+                    function () {
+                        return testWindow.$("#phcode-io-main-nav").hasClass("phoenix-pro");
+                    },
+                    `Verify Pro branding to appear: ${testDescription}`, 5000
+                );
+                expect($brandingLink.hasClass("phoenix-pro")).toBe(true);
+                expect($brandingLink.text()).toContain("Phoenix Pro");
+                expect($brandingLink.find(".fa-feather").length).toBe(1);
+            } else {
+                await awaitsFor(
+                    function () {
+                        return !testWindow.$("#phcode-io-main-nav").hasClass("phoenix-pro");
+                    },
+                    `Verify Pro branding to go away: ${testDescription}`, 5000
+                );
+                expect($brandingLink.hasClass("phoenix-pro")).toBe(false);
+                expect($brandingLink.text()).toBe("phcode.io");
+            }
+        }
 
-                // Step 2: Wait for login popup to appear (check both modal and profile-popup)
+        const VIEW_TRIAL_DAYS_LEFT = "VIEW_TRIAL_DAYS_LEFT";
+        const VIEW_PHOENIX_PRO = "VIEW_PHOENIX_PRO";
+        const VIEW_PHOENIX_FREE = "VIEW_PHOENIX_FREE";
+        async function verifyProfilePopupContent(expectedView, testDescription) {
+            await awaitsFor(
+                function () {
+                    return testWindow.$('.profile-popup').length > 0;
+                },
+                `Profile popup to appear: ${testDescription}`,
+                3000
+            );
+
+            if (expectedView === VIEW_PHOENIX_PRO) {
+                await awaitsFor(
+                    function () {
+                        const $popup = testWindow.$('.profile-popup');
+                        const $planName = $popup.find('.user-plan-name');
+                        const planText = $planName.text();
+                        return planText.includes("Phoenix Pro");
+                    },
+                    `Profile popup should say phoenix pro: ${testDescription}`, 5000
+                );
+                const $popup = testWindow.$('.profile-popup');
+                const $planName = $popup.find('.user-plan-name');
+                const planText = $planName.text();
+                expect(planText).toContain("Phoenix Pro");
+                expect(planText).not.toContain("days left");
+                expect($popup.find(".fa-feather").length).toBe(1);
+            } else if (expectedView === VIEW_TRIAL_DAYS_LEFT) {
+                await awaitsFor(
+                    function () {
+                        const $popup = testWindow.$('.profile-popup');
+                        const $planName = $popup.find('.user-plan-name');
+                        const planText = $planName.text();
+                        return planText.includes("Phoenix Pro") && planText.includes("days left");
+                    },
+                    `Profile popup should say phoenix pro trial: ${testDescription}`, 5000
+                );
+                const $popup = testWindow.$('.profile-popup');
+                const $planName = $popup.find('.user-plan-name');
+                const planText = $planName.text();
+                expect(planText).toContain("Phoenix Pro");
+                expect(planText).toContain("days left");
+                expect($popup.find(".fa-feather").length).toBe(1);
+            } else {
                 await awaitsFor(
                     function () {
-                        return testWindow.$('.modal').length > 0 || testWindow.$('.profile-popup').length > 0;
+                        const $popup = testWindow.$('.profile-popup');
+                        const $planName = $popup.find('.user-plan-name');
+                        const planText = $planName.text();
+                        return !planText.includes("Phoenix Pro");
                     },
-                    "Login popup to appear",
-                    3000
+                    `Profile popup should not say phoenix pro: ${testDescription}`, 5000
                 );
+                const $popup = testWindow.$('.profile-popup');
+                const $planName = $popup.find('.user-plan-name');
+                const planText = $planName.text();
+                expect(planText).not.toContain("Phoenix Pro");
+                expect($popup.find(".fa-feather").length).toBe(0);
+            }
+        }
 
-                // Get the popup content (could be modal or profile-popup)
-                let popupContent = testWindow.$('.modal');
-                if (popupContent.length === 0) {
-                    popupContent = testWindow.$('.profile-popup');
-                }
-                expect(testWindow.$('.profile-popup').is(':visible')).toBe(true);
+        async function cleanupTrialState() {
+            const PromotionExports = testWindow._test_promo_login_exports;
+            await PromotionExports._cleanTrialData();
+        }
 
-                // Verify it's the login popup (contains sign in button)
-                const signInButton = popupContent.find('#phoenix-signin-btn');
-                expect(signInButton.length).toBe(1);
-                expect(signInButton.text().trim().toLocaleLowerCase()).toContain('sign in');
-
-                // Step 3: Mock successful desktop login responses FIRST (using desktop test exports)
-                console.log("llgT: Setting up fetch mock EARLY using login-desktop exports");
-                console.log("llgT: LoginDesktopExports.setFetchFn available?", !!LoginDesktopExports.setFetchFn);
-
-                if (LoginDesktopExports.setFetchFn) {
-                    // Track sign out state for proper mock responses
-                    let userSignedOut = false;
-                    let authSessionCreated = false;
-
-                    LoginDesktopExports.setFetchFn((url, options) => {
-                        console.log("llgT: login-desktop fetchFn called with URL:", url);
-                        console.log("llgT: login-desktop fetchFn called with options:", options);
-
-                        // Handle different endpoints
-                        if (url.includes('/getAppAuthSession')) {
-                            // App auth session creation endpoint
-                            console.log("llgT: Handling getAppAuthSession endpoint call");
-                            authSessionCreated = true;
-                            return Promise.resolve({
-                                ok: true,
-                                status: 200,
-                                json: () => Promise.resolve({
-                                    isSuccess: true,
-                                    appSessionID: "test-session-123",
-                                    validationCode: "123456"
-                                })
-                            });
-                        } else if (url.includes('/resolveAPIKey') || url.includes('/resolveAppSessionID')) {
-                            // API key resolution endpoint (both resolveAPIKey and resolveAppSessionID)
-                            if (userSignedOut) {
-                                console.log("llgT: User is signed out, returning 401 for resolve endpoint");
-                                return Promise.resolve({
-                                    ok: false,
-                                    status: 401,
-                                    json: () => Promise.resolve({
-                                        isSuccess: false
-                                    })
-                                });
-                            } else {
-                                console.log("llgT: User is signed in, returning success for resolve endpoint");
-                                return Promise.resolve({
-                                    ok: true,
-                                    status: 200,
-                                    json: () => Promise.resolve({
-                                        isSuccess: true,
-                                        email: "test@example.com",
-                                        firstName: "Test",
-                                        lastName: "User",
-                                        customerID: "test-customer-id",
-                                        apiKey: "test-api-key",
-                                        validationCode: "123456",
-                                        profileIcon: {
-                                            initials: "TU",
-                                            color: "#14b8a6"
-                                        }
-                                    })
-                                });
-                            }
-                        } else if (url.includes('/signOut') || url.includes('/logoutSession')) {
-                            // Logout endpoint - set signed out state (both signOut and logoutSession)
-                            console.log("llgT: Handling logout endpoint call, marking user as signed out");
-                            userSignedOut = true;
-                            return Promise.resolve({
-                                ok: true,
-                                status: 200,
-                                json: () => Promise.resolve({
-                                    isSuccess: true
-                                })
-                            });
-                        } else {
-                            // Default response for any other endpoints
-                            console.log("llgT: Unknown endpoint, returning default response");
-                            return Promise.resolve({
-                                ok: true,
-                                status: 200,
-                                json: () => Promise.resolve({
-                                    isSuccess: true
-                                })
-                            });
-                        }
-                    });
-                    console.log("llgT: login-desktop fetch mock set up successfully for all endpoints");
-                } else {
-                    console.log("llgT: LoginDesktopExports.setFetchFn not available!");
+        const SIGNIN_POPUP = "SIGNIN_POPUP";
+        const PROFILE_POPUP = "PROFILE_POPUP";
+        async function popupToAppear(popupType = SIGNIN_POPUP) {
+            const statusText = popupType === SIGNIN_POPUP ?
+                "Sign In popup to appear" : "Profile popup to appear";
+            await awaitsFor(
+                function () {
+                    const selector = popupType === SIGNIN_POPUP ? ".login-profile-popup" : ".user-profile-popup";
+                    return testWindow.$('.modal').length > 0 || testWindow.$(selector).length > 0;
+                },
+                statusText, 3000
+            );
+        }
+
+        async function performFullLoginFlow() {
+            // Mock desktop app functions for login flow
+            testWindow.Phoenix.app.openURLInDefaultBrowser = function(url) {
+                return true;
+            };
+            testWindow.Phoenix.app.copyToClipboard = function(text) {
+                return true;
+            };
+
+            // Click profile button
+            const $profileButton = testWindow.$("#user-profile-button");
+            $profileButton.trigger('click');
+            await popupToAppear(SIGNIN_POPUP);
+
+            // Find and click sign in button
+            let popupContent = testWindow.$('.profile-popup');
+            const signInButton = popupContent.find('#phoenix-signin-btn');
+            signInButton.trigger('click');
+
+            // Wait for desktop login dialog
+            await testWindow.__PR.waitForModalDialog(".modal");
+
+            // Click refresh button to verify login
+            const refreshButton = testWindow.$('.modal').find('[data-button-id="refresh"]');
+            refreshButton.trigger('click');
+
+            // Wait for login to complete
+            await awaitsFor(
+                function () {
+                    return LoginServiceExports.LoginService.isLoggedIn();
+                },
+                "User to be logged in",
+                5000
+            );
+
+            // Wait for login dialog to close
+            await testWindow.__PR.waitForModalDialogClosed(".modal");
+
+            // Wait for profile icon to update with user data
+            await awaitsFor(
+                function () {
+                    const $profileIcon = testWindow.$("#user-profile-button");
+                    const profileIconContent = $profileIcon.html();
+                    return profileIconContent && profileIconContent.includes('TU');
+                },
+                "profile icon to update with user initials",
+                3000
+            );
+        }
+
+        async function performFullLogoutFlow() {
+            // Click profile button to open popup
+            const $profileButton = testWindow.$("#user-profile-button");
+            $profileButton.trigger('click');
+
+            // Wait for profile popup
+            await popupToAppear(PROFILE_POPUP);
+
+            // Find and click sign out button
+            let popupContent = testWindow.$('.profile-popup');
+            const signOutButton = popupContent.find('#phoenix-signout-btn');
+            signOutButton.trigger('click');
+
+            // Wait for sign out confirmation dialog and dismiss it
+            await testWindow.__PR.waitForModalDialog(".modal");
+            testWindow.__PR.clickDialogButtonID(testWindow.__PR.Dialogs.DIALOG_BTN_OK);
+            await testWindow.__PR.waitForModalDialogClosed(".modal");
+
+            // Wait for sign out to complete
+            await awaitsFor(
+                function () {
+                    return !LoginServiceExports.LoginService.isLoggedIn();
+                },
+                "User to be signed out",
+                10000
+            );
+            verifyProfileIconBlanked();
+        }
+
+        function verifyProfileIconBlanked() {
+            const $profileIcon = testWindow.$("#user-profile-button");
+            const initialContent = $profileIcon.html();
+            expect(initialContent).not.toContain('TU');
+        }
+
+        describe("Desktop Login and Promotion Tests", function () {
+
+            beforeEach(async function () {
+                // Ensure clean state before each test
+                if (LoginServiceExports.LoginService.isLoggedIn()) {
+                    await performFullLogoutFlow();
+                }
+                if (LoginServiceExports.LoginService.isLoggedIn()) {
+                    throw new Error("Promotion tests require user to be logged out at start." +
+                        " Please log out before running these tests.");
                 }
+                await cleanupTrialState();
+            });
+
+            it("should complete login and logout flow", async function () {
+                // Setup basic user mock
+                setupProUserMock(false);
+
+                // Perform full login flow
+                await performFullLoginFlow();
+                expect(LoginServiceExports.LoginService.isLoggedIn()).toBe(true);
+
+                // Perform full logout flow
+                await performFullLogoutFlow();
+                expect(LoginServiceExports.LoginService.isLoggedIn()).toBe(false);
+                verifyProfileIconBlanked();
+            });
 
-                // Step 4: Mock desktop app functions
+            it("should open browser and copy validation code", async function () {
+                // Setup basic user mock
+                setupProUserMock(false);
+
+                // Mock desktop app functions
                 let capturedBrowserURL = null;
                 let capturedClipboardText = null;
 
-                // Mock both Phoenix.app and NativeApp for desktop functionality
                 if (testWindow.Phoenix && testWindow.Phoenix.app) {
                     testWindow.Phoenix.app.openURLInDefaultBrowser = function(url) {
-                        console.log("llgT: Phoenix.app.openURLInDefaultBrowser called with:", url);
                         capturedBrowserURL = url;
                         return true;
                     };
-
                     testWindow.Phoenix.app.copyToClipboard = function(text) {
-                        console.log("llgT: Phoenix.app.copyToClipboard called with:", text);
                         capturedClipboardText = text;
                         return true;
                     };
                 }
 
-                // Desktop login uses NativeApp, so mock that too
-                if (!testWindow.NativeApp) {
-                    testWindow.NativeApp = {};
-                }
-                testWindow.NativeApp.openURLInDefaultBrowser = function(url) {
-                    console.log("llgT: NativeApp.openURLInDefaultBrowser called with:", url);
-                    capturedBrowserURL = url;
-                    return true;
-                };
-
-                // Step 5: Click the sign in button
-                console.log("llgT: About to click sign in button");
+                // Click profile button and sign in
+                const $profileButton = testWindow.$("#user-profile-button");
+                $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
+
+                const popupContent = testWindow.$('.profile-popup');
+                const signInButton = popupContent.find('#phoenix-signin-btn');
                 signInButton.trigger('click');
 
-                // Step 6: Wait for desktop login dialog with validation code to appear
-                console.log("llgT: Waiting for desktop login dialog...");
+                // Wait for desktop login dialog
                 await testWindow.__PR.waitForModalDialog(".modal");
 
-                // Get desktop login dialog content
-                let desktopLoginDialog = testWindow.$('.modal');
-                expect(desktopLoginDialog.length).toBeGreaterThan(0);
-
-                // Verify desktop login dialog contains validation code elements
-                const validationCodeElement = desktopLoginDialog.find('.validation-code');
-                const copyButton = desktopLoginDialog.find('[data-button-id="copy"]');
-                const openBrowserButton = desktopLoginDialog.find('[data-button-id="open"]'); // Fixed: was "openBrowser"
-                const refreshButton = desktopLoginDialog.find('[data-button-id="refresh"]'); // Fixed: was "check"
-
-                console.log("llgT: Validation code element found:", validationCodeElement.length);
-                console.log("llgT: Copy button found:", copyButton.length);
-                console.log("llgT: Open browser button found:", openBrowserButton.length);
-                console.log("llgT: Refresh button found:", refreshButton.length);
-
-                expect(validationCodeElement.length).toBe(1);
-                expect(copyButton.length).toBe(1);
-                expect(openBrowserButton.length).toBe(1);
-                expect(refreshButton.length).toBe(1);
-
-                // Step 7: Test copy button functionality
-                console.log("llgT: Testing copy button");
+                // Test copy functionality
+                const copyButton = testWindow.$('.modal').find('[data-button-id="copy"]');
                 copyButton.trigger('click');
                 expect(capturedClipboardText).toBe("123456");
 
-                // Step 8: Test open browser button functionality
-                console.log("llgT: Testing open browser button");
+                // Test open browser functionality
+                const openBrowserButton = testWindow.$('.modal').find('[data-button-id="open"]');
                 openBrowserButton.trigger('click');
                 expect(capturedBrowserURL).toBeDefined();
                 expect(capturedBrowserURL).toContain('authorizeApp');
                 expect(capturedBrowserURL).toContain('test-session-123');
+            });
 
-                // Step 9: Click "Refresh" button to verify login (desktop equivalent of "Check Now")
-                console.log("llgT: Clicking Refresh button");
-                refreshButton.trigger('click');
+            it("should update profile icon after login", async function () {
+                // Setup basic user mock
+                setupProUserMock(false);
 
-                // Wait for login verification to complete and success message
-                await awaitsFor(
-                    function () {
-                        return  LoginServiceExports.LoginService.isLoggedIn();
-                    },
-                    "User to be logged in",
-                    5000
-                );
+                // Verify initial state
+                const $profileIcon = testWindow.$("#user-profile-button");
+                const initialContent = $profileIcon.html();
+                expect(initialContent).not.toContain('TU');
 
-                // Verify profile icon has been updated with user initials
+                // Perform login
+                await performFullLoginFlow();
+
+                // Wait for profile icon to update
                 await awaitsFor(
                     function () {
                         const $profileIcon = testWindow.$("#user-profile-button");
@@ -337,109 +526,179 @@ define(function (require, exports, module) {
                     "profile icon to contain user initials",
                     5000
                 );
-                const $profileIcon = testWindow.$("#user-profile-button");
-                const profileIconContent = $profileIcon.html();
-                expect(profileIconContent).toContain('svg'); // Should contain SVG element
-                expect(profileIconContent).toContain('TU'); // Should contain user initials
 
-                // Step 10: Wait for desktop login dialog to close automatically
-                await testWindow.__PR.waitForModalDialogClosed(".modal");
+                // Verify profile icon updated with user initials
+                const updatedContent = $profileIcon.html();
+                expect(updatedContent).toContain('svg');
+                expect(updatedContent).toContain('TU');
+
+                // Logout for cleanup
+                await performFullLogoutFlow();
+            });
+
+            it("should show correct popup states", async function () {
+                // Setup basic user mock
+                setupProUserMock(false);
+
+                const $profileButton = testWindow.$("#user-profile-button");
 
-                // Step 11: Click profile icon again to verify profile popup appears
+                // Test initial state - should show signin popup
                 $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
 
-                // Wait for profile popup (not login popup) to appear
-                await awaitsFor(
-                    function () {
-                        return testWindow.$('.modal').length > 0 ||
-                               testWindow.$('.profile-popup').length > 0;
-                    },
-                    "Profile popup to appear",
-                    3000
-                );
+                let popupContent = testWindow.$('.profile-popup');
+                const signInButton = popupContent.find('#phoenix-signin-btn');
+                const signOutButton = popupContent.find('#phoenix-signout-btn');
 
-                // Get the new popup content
-                let newPopupContent = testWindow.$('.modal');
-                if (newPopupContent.length === 0) {
-                    newPopupContent = testWindow.$('.profile-popup');
-                }
+                expect(signInButton.length).toBe(1);
+                expect(signOutButton.length).toBe(0);
 
-                // Verify it's the profile popup (contains sign out button, not sign in)
-                const signOutButton = newPopupContent.find('#phoenix-signout-btn');
-                const newSignInButton = newPopupContent.find('#phoenix-signin-btn');
+                // Close popup
+                $profileButton.trigger('click');
 
-                expect(signOutButton.length).toBe(1); // Should have sign out button
-                expect(newSignInButton.length).toBe(0); // Should NOT have sign in button
+                // Perform login
+                await performFullLoginFlow();
 
-                // Step 12: Test sign out functionality
-                console.log("llgT: About to click sign out button");
-                console.log("llgT: Login state before sign out:", LoginServiceExports.LoginService.isLoggedIn());
+                // Test logged in state - should show profile popup
+                $profileButton.trigger('click');
+                await popupToAppear(PROFILE_POPUP);
 
-                signOutButton.trigger('click');
+                popupContent = testWindow.$('.profile-popup');
+                const newSignInButton = popupContent.find('#phoenix-signin-btn');
+                const newSignOutButton = popupContent.find('#phoenix-signout-btn');
 
-                // Wait for sign out dialog to appear and dismiss it
-                console.log("llgT: Waiting for sign out confirmation dialog");
-                await testWindow.__PR.waitForModalDialog(".modal");
+                expect(newSignInButton.length).toBe(0);
+                expect(newSignOutButton.length).toBe(1);
 
-                // Dismiss the "you have been signed out" dialog with OK button
-                console.log("llgT: Dismissing sign out confirmation dialog");
-                testWindow.__PR.clickDialogButtonID(testWindow.__PR.Dialogs.DIALOG_BTN_OK);
-                await testWindow.__PR.waitForModalDialogClosed(".modal");
+                // Close popup and logout for cleanup
+                $profileButton.trigger('click');
+                await performFullLogoutFlow();
 
-                // Wait for sign out to complete
-                console.log("llgT: Waiting for user to be signed out...");
-                await awaitsFor(
-                    function () {
-                        return !LoginServiceExports.LoginService.isLoggedIn();
-                    },
-                    "User to be signed out",
-                    10000
-                );
+                // Test final state - should be back to signin popup
+                $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
 
-                // Verify user is now signed out
-                expect(LoginServiceExports.LoginService.isLoggedIn()).toBe(false);
+                popupContent = testWindow.$('.profile-popup');
+                const finalSignInButton = popupContent.find('#phoenix-signin-btn');
+                const finalSignOutButton = popupContent.find('#phoenix-signout-btn');
 
-                // Verify profile icon has been updated (should be empty again)
-                const $profileIconAfterSignout = testWindow.$("#user-profile-button");
-                const profileIconContentAfterSignout = $profileIconAfterSignout.html();
-                console.log("llgT: Profile icon after signout:", profileIconContentAfterSignout);
+                expect(finalSignInButton.length).toBe(1);
+                expect(finalSignOutButton.length).toBe(0);
 
-                // Step 13: Verify clicking profile icon again shows login popup (not profile popup)
-                console.log("llgT: Clicking profile icon after sign out to verify login popup appears");
-                $profileIconAfterSignout.trigger('click');
+                // Close popup
+                $profileButton.trigger('click');
+            });
 
-                // Wait for login popup to appear again
-                await awaitsFor(
-                    function () {
-                        return testWindow.$('.modal').length > 0 || testWindow.$('.profile-popup').length > 0;
-                    },
-                    "Login popup to appear after signout",
-                    3000
-                );
+            it("should show pro branding for user with pro subscription (expired trial)", async function () {
+                console.log("llgT: Starting desktop pro user with expired trial test");
 
-                // Get the popup content after signout
-                let finalPopupContent = testWindow.$('.modal');
-                if (finalPopupContent.length === 0) {
-                    finalPopupContent = testWindow.$('.profile-popup');
-                }
+                // Setup: Pro subscription + expired trial
+                setupProUserMock(true);
+                await setupExpiredTrial();
 
-                // Verify it's back to login popup (has sign in button, no sign out button)
-                const finalSignInButton = finalPopupContent.find('#phoenix-signin-btn');
-                const finalSignOutButton = finalPopupContent.find('#phoenix-signout-btn');
+                // Verify initial state (no pro branding)
+                await verifyProBranding(false, "no pro branding to start with");
 
-                expect(finalSignInButton.length).toBe(1); // Should have sign in button again
-                expect(finalSignOutButton.length).toBe(0); // Should NOT have sign out button
+                // Perform login
+                await performFullLoginFlow();
+                await verifyProBranding(true, "pro branding to appear after pro user login");
 
-                // Close the final popup
-                if (testWindow.$('.modal').length > 0) {
-                    testWindow.__PR.clickDialogButtonID(testWindow.__PR.Dialogs.DIALOG_BTN_CANCEL);
-                    await testWindow.__PR.waitForModalDialogClosed(".modal");
-                } else {
-                    // If it's not a modal, just click outside or use popup close method
-                    $profileIconAfterSignout.trigger('click'); // Toggle to close
-                }
+                // Check profile popup shows pro status (not trial)
+                const $profileButton = testWindow.$("#user-profile-button");
+                $profileButton.trigger('click');
 
-                // Test completed successfully!
+                // Wait for profile popup to show "phoenix pro <leaf>"
+                await verifyProfilePopupContent(VIEW_PHOENIX_PRO, "pro user profile popup");
+
+                // Close popup
+                $profileButton.trigger('click');
+
+                // Perform logout
+                await performFullLogoutFlow();
+
+                // For user with pro subscription + expired trial:
+                // After logout, pro branding should disappear because:
+                // 1. No server entitlements (logged out)
+                // 2. Trial is expired (0 days remaining)
+                await verifyProBranding(false, "Pro branding to disappear after logout");
+            });
+
+            it("should show trial branding for user without pro subscription (active trial)", async function () {
+                console.log("llgT: Starting desktop trial user test");
+
+                // Setup: No pro subscription + active trial (15 days)
+                setupProUserMock(false);
+                await setupTrialState(15);
+
+                // Verify initial state shows pro branding due to trial
+                await verifyProBranding(true, "Trial branding to appear initially");
+
+                // Perform login
+                await performFullLoginFlow();
+
+                // Verify pro branding remains after login
+                await verifyProBranding(true, "after trial user login");
+
+                // Check profile popup shows trial status
+                const $profileButton = testWindow.$("#user-profile-button");
+                $profileButton.trigger('click');
+                await popupToAppear(PROFILE_POPUP);
+                await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                    "trial user profile popup for logged in user");
+
+                // Close popup
+                $profileButton.trigger('click');
+
+                // Perform logout
+                await performFullLogoutFlow();
+
+                // Verify pro branding remains after logout (trial continues)
+                await verifyProBranding(true, "Trial branding to remain after logout");
+
+                // Check profile popup still shows trial status
+                $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
+                await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                    "trial user profile popup for logged out user");
+
+                // Close popup
+                $profileButton.trigger('click');
+            });
+
+            it("should prioritize pro subscription over trial in profile popup", async function () {
+                console.log("llgT: Starting desktop trial user with pro subscription test");
+
+                // Setup: Pro subscription + active trial
+                setupProUserMock(true);
+                await setupTrialState(10);
+
+                // Perform login
+                await performFullLoginFlow();
+
+                // Verify pro branding appears
+                await verifyProBranding(true, "Pro branding to appear for pro user");
+
+                // Check profile popup shows pro status (not trial text)
+                const $profileButton = testWindow.$("#user-profile-button");
+                $profileButton.trigger('click');
+                await popupToAppear(PROFILE_POPUP);
+
+                // Should show pro, not trial, since user has paid subscription
+                await verifyProfilePopupContent(VIEW_PHOENIX_PRO,
+                    "pro+trial user profile should not show trial branding");
+
+                // Close popup
+                $profileButton.trigger('click');
+
+                // Perform logout
+                await performFullLogoutFlow();
+
+                // Verify pro branding remains due to trial (even though subscription is gone)
+                await verifyProBranding(true, "Pro branding should remain after logout as trial user");
+                $profileButton.trigger('click');
+                await popupToAppear(SIGNIN_POPUP);
+                await verifyProfilePopupContent(VIEW_TRIAL_DAYS_LEFT,
+                    "trial user profile popup for logged out user");
             });
         });
     });
diff --git a/test/spec/promotions-integ-test.js b/test/spec/promotions-integ-test.js
index 28e5dea41d..69fe3a55cb 100644
--- a/test/spec/promotions-integ-test.js
+++ b/test/spec/promotions-integ-test.js
@@ -18,7 +18,7 @@
  *
  */
 
-/*global describe, it, expect, beforeAll, afterAll, beforeEach, afterEach, awaitsFor, awaitsForDone, awaits*/
+/*global describe, it, expect, beforeAll, afterAll, beforeEach, afterEach, awaits*/
 
 define(function (require, exports, module) {
 
@@ -86,6 +86,8 @@ define(function (require, exports, module) {
                 testWindow._test_pro_dlg_login_exports.setFetchFn(originalFetch);
             }
 
+            LoginServicePromo.setDateNowFn(Date.now);
+
             testWindow = null;
             LoginServicePromo = null;
             ProDialogs = null;
@@ -251,7 +253,7 @@ define(function (require, exports, module) {
                 expect(currentResult.data.proVersion).toBe("3.1.0");
                 expect(currentResult.data.endDate).toBe(existingTrial.endDate);
 
-                // For same version, no dialog should appear
+                // For same version, no dialog should appear. lets wait a bit to make sure it doesn't show up'
                 await awaits(500);
                 const modalContent = testWindow.$('.modal:visible');
                 expect(modalContent.length).toBe(0);
@@ -277,7 +279,7 @@ define(function (require, exports, module) {
                 expect(currentResult.data.proVersion).toBe("3.2.0"); // Should preserve original version
                 expect(currentResult.data.endDate).toBe(existingTrial.endDate); // Should preserve end date
 
-                // For older current version, no dialog should appear
+                // For same version, no dialog should appear. lets wait a bit to make sure it doesn't show up
                 await awaits(500);
                 const modalContent = testWindow.$('.modal:visible');
                 expect(modalContent.length).toBe(0);