diff --git a/src/renderer/src/views/ManageAccountView.vue b/src/renderer/src/views/ManageAccountView.vue
deleted file mode 100644
index 9df7a09d..00000000
--- a/src/renderer/src/views/ManageAccountView.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<script setup lang="ts">
-import { Ref, ref, onMounted, onUnmounted, inject, watch } from 'vue'
-import Electron from 'electron';
-import type { DeviceInfo } from '../types';
-
-const props = defineProps<{
-    shouldShow: boolean;
-}>();
-
-const emit = defineEmits<{
-    redirectToAccount: [accountID: number],
-}>()
-
-// Watch for changes in shouldShow
-watch(() => props.shouldShow, async (newValue) => {
-    if (newValue) {
-        if (newValue) {
-            console.log('ManageAccountView', 'shouldShow is true, loading dash...');
-            await loadDash();
-        } else {
-            console.log('ManageAccountView', 'shouldShow is false, loading about:blank');
-            await loadEmpty();
-        }
-        isWebviewMounted.value = true;
-    }
-});
-
-const deviceInfo = inject('deviceInfo') as Ref<DeviceInfo | null>;
-
-const webviewComponent = ref<Electron.WebviewTag | null>(null);
-const isWebviewMounted = ref(true);
-
-const waitForWebview = async () => {
-    while (webviewComponent.value === null) {
-        await new Promise(resolve => setTimeout(resolve, 100));
-    }
-};
-
-const loadEmpty = async () => {
-    await waitForWebview();
-    if (webviewComponent.value !== null) {
-        const webview = webviewComponent.value;
-        await webview.loadURL('about:blank');
-    }
-};
-
-const loadDash = async () => {
-    await waitForWebview();
-    if (webviewComponent.value !== null) {
-        const mode = localStorage.getItem('manageAccountMode');
-
-        // Add event listener
-        webviewComponent.value.addEventListener('load-commit', onLoadCommit);
-
-        const dashURL = await window.electron.getDashURL();
-        const nativeLoginURL = `${dashURL}/#/native-login/${deviceInfo.value?.userEmail}/${deviceInfo.value?.deviceToken}/${mode}`;
-        console.log('ManageAccountView: Loading dash', mode, nativeLoginURL);
-
-        const webview = webviewComponent.value;
-        await webview.loadURL(nativeLoginURL);
-    } else {
-        console.error('Webview component not found');
-    }
-};
-
-const onLoadCommit = async (event: Electron.LoadCommitEvent) => {
-    const url = event.url;
-    console.log("ManageAccountView: onLoadCommit", url)
-
-    // Check for open receipt in external browser
-    if (url.includes('/native-app-open-receipt/')) {
-        console.log("ManageAccountView: intercepted receipt open")
-        const hashIndex = url.indexOf('#/native-app-open-receipt/');
-        if (hashIndex !== -1) {
-            const receiptURLB64 = url.substring(hashIndex + '#/native-app-open-receipt/'.length);
-            const receiptURL = atob(receiptURLB64);
-            console.log("ManageAccountView: opening URL", receiptURL)
-            await window.electron.openURL(receiptURL);
-        } else {
-            console.error("ManageAccountView: Invalid URL format")
-        }
-        loadDash();
-    }
-
-    // Check for redirect
-    if (localStorage.getItem("manageAccountMode") == "premium") {
-        if (url.includes('/native-app-premium-enabled')) {
-            const accountID = localStorage.getItem('manageAccountRedirectAccountID');
-            if (!accountID) {
-                console.error('ManageAccountView: No account ID found in localStorage');
-                loadDash();
-                return;
-            }
-            const accountIDNumber = parseInt(accountID, 10);
-
-            console.log('ManageAccountView: Redirecting to account', accountIDNumber);
-            emit('redirectToAccount', accountIDNumber);
-
-            // Remove event listener, and load about:blank
-            if (webviewComponent.value !== null) {
-                webviewComponent.value.removeEventListener('load-commit', onLoadCommit);
-            }
-            await webviewComponent.value?.loadURL('about:blank');
-        }
-    }
-};
-
-onMounted(async () => {
-    await loadDash();
-});
-
-onUnmounted(async () => {
-    isWebviewMounted.value = false;
-
-    if (webviewComponent.value !== null) {
-        webviewComponent.value.removeEventListener('load-commit', onLoadCommit);
-    }
-});
-</script>
-
-<template>
-    <div v-if="shouldShow" class="wrapper d-flex flex-column">
-        <webview ref="webviewComponent" src="about:blank" class="webview mt-3" :partition="`persist:account-manage`" />
-    </div>
-</template>
-
-<style scoped></style>
\ No newline at end of file
diff --git a/src/renderer/src/views/TabsView.vue b/src/renderer/src/views/TabsView.vue
index 1220db30..b5421fbc 100644
--- a/src/renderer/src/views/TabsView.vue
+++ b/src/renderer/src/views/TabsView.vue
@@ -5,8 +5,8 @@ import AccountView from './AccountView.vue';
 import CydAPIClient from '../../../cyd-api-client';
 import type { DeviceInfo } from '../types';
 import type { Account } from '../../../shared_types';
-import ManageAccountView from './ManageAccountView.vue';
 import AboutView from './AboutView.vue';
+import { openURL } from '../util';
 
 // Get the global emitter
 const vueInstance = getCurrentInstance();
@@ -24,12 +24,10 @@ const refreshDeviceInfo = inject('refreshDeviceInfo') as () => Promise<void>;
 const refreshAPIClient = inject('refreshAPIClient') as () => Promise<void>;
 
 const hideAllAccounts = ref(false);
-const showManageAccount = ref(false);
 
 const showAbout = ref(false);
 
 const accountClicked = async (account: Account) => {
-  hideManageAccountView();
   hideAboutView();
 
   activeAccountID.value = account.id;
@@ -48,7 +46,6 @@ const accountClicked = async (account: Account) => {
 };
 
 const addAccountClicked = async () => {
-  hideManageAccountView();
   hideAboutView();
 
   // Do we already have an unknown account?
@@ -91,7 +88,6 @@ const removeAccount = async (accountID: number) => {
 }
 
 const accountSelected = async (account: Account, accountType: string) => {
-  hideManageAccountView();
   hideAboutView();
 
   try {
@@ -131,44 +127,27 @@ const outsideUserMenuClicked = (event: MouseEvent) => {
   }
 };
 
-const showManageAccountView = () => {
+const openDashboard = async () => {
   userBtnShowMenu.value = false;
 
-  showManageAccount.value = true;
-  showAbout.value = false;
-  hideAllAccounts.value = true;
-};
-
-const hideManageAccountView = () => {
-  showManageAccount.value = false;
-  showAbout.value = false;
-  hideAllAccounts.value = false;
+  const dashURL = await window.electron.getDashURL();
+  const nativeLoginURL = `${dashURL}/#/native-login/${deviceInfo.value?.userEmail}/${deviceInfo.value?.deviceToken}/manage`;
+  openURL(nativeLoginURL);
 };
 
-emitter?.on('show-manage-account', showManageAccountView);
+emitter?.on('show-manage-account', openDashboard);
 
 const manageAccountClicked = async () => {
-  localStorage.setItem('manageAccountMode', 'manage');
-  showManageAccountView();
-};
-
-const redirectToAccount = (accountID: number) => {
-  // This forces the account to re-check if the user is signed in and if premium is enabled
-  emitter?.emit('signed-in');
-
-  activeAccountID.value = accountID;
-  hideManageAccountView();
+  openDashboard();
 };
 
 const showAboutView = () => {
   userBtnShowMenu.value = false;
-  showManageAccount.value = false;
   showAbout.value = true;
   hideAllAccounts.value = true;
 };
 
 const hideAboutView = () => {
-  showManageAccount.value = false;
   showAbout.value = false;
   hideAllAccounts.value = false;
 };
@@ -178,7 +157,6 @@ const aboutClicked = async () => {
 };
 
 const signInClicked = async () => {
-  localStorage.setItem('manageAccountMode', 'manage');
   emitter?.emit('show-sign-in');
 };
 
@@ -207,12 +185,9 @@ const signOutClicked = async () => {
   await refreshDeviceInfo();
   await refreshAPIClient();
 
-  showManageAccount.value = false;
   userBtnShowMenu.value = false;
 
   emitter?.emit('signed-out');
-
-  hideManageAccountView();
 };
 
 const checkForUpdatesClicked = async () => {
@@ -242,7 +217,7 @@ onMounted(async () => {
   document.addEventListener('click', outsideUserMenuClicked);
   document.addEventListener('auxclick', outsideUserMenuClicked);
 
-  emitter?.on('signed-in', showManageAccountView);
+  emitter?.on('signed-in', openDashboard);
   emitter?.on('account-updated', reloadAccounts);
 });
 
@@ -339,9 +314,6 @@ onUnmounted(async () => {
           :class="{ 'hide': hideAllAccounts || activeAccountID !== account.id }" @account-selected="accountSelected"
           @on-remove-clicked="removeAccount(account.id)" />
 
-        <!-- Manay my Cyd account -->
-        <ManageAccountView :should-show="showManageAccount" @redirect-to-account="redirectToAccount" />
-
         <!-- About -->
         <AboutView :should-show="showAbout" />
       </div>
diff --git a/src/renderer/src/views/x/AccountXView.vue b/src/renderer/src/views/x/AccountXView.vue
index d36ca842..fa77d80f 100644
--- a/src/renderer/src/views/x/AccountXView.vue
+++ b/src/renderer/src/views/x/AccountXView.vue
@@ -219,15 +219,17 @@ const updateUserPremium = async () => {
         return;
     }
     userPremium.value = userPremiumResp.premium_access;
+
+    if (!userPremium.value) {
+        console.log('User does not have Premium access');
+        emitter?.emit(`x-premium-check-failed-${props.account.id}`);
+    }
 };
 
 emitter?.on('signed-in', async () => {
     console.log('AccountXView: User signed in');
     await updateUserAuthenticated();
     await updateUserPremium();
-    if (!userPremium.value) {
-        emitter?.emit('show-manage-account');
-    }
 });
 
 emitter?.on('signed-out', async () => {
@@ -480,7 +482,7 @@ onUnmounted(async () => {
                     <XWizardCheckPremium v-if="model.state == State.WizardCheckPremiumDisplay" :model="unref(model)"
                         :user-authenticated="userAuthenticated" :user-premium="userPremium"
                         @set-state="setState($event)" @update-account="updateAccount"
-                        @start-jobs-just-save="startJobsJustSave" />
+                        @start-jobs-just-save="startJobsJustSave" @update-user-premium="updateUserPremium" />
 
                     <XFinishedRunningJobsPage v-if="model.state == State.FinishedRunningJobsDisplay"
                         :model="unref(model)"
diff --git a/src/renderer/src/views/x/XWizardCheckPremium.vue b/src/renderer/src/views/x/XWizardCheckPremium.vue
index 38b69219..a7f2fea3 100644
--- a/src/renderer/src/views/x/XWizardCheckPremium.vue
+++ b/src/renderer/src/views/x/XWizardCheckPremium.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { getCurrentInstance } from 'vue';
+import { ref, getCurrentInstance } from 'vue';
 import {
     AccountXViewModel,
     State
@@ -19,22 +19,32 @@ const props = defineProps<{
 // Emits
 const emit = defineEmits<{
     setState: [value: State]
-    startJobsJustSave: []
+    startJobsJustSave: [],
+    updateUserPremium: [],
 }>()
 
 // Buttons
 const signInClicked = async () => {
-    localStorage.setItem('manageAccountMode', 'premium');
-    localStorage.setItem('manageAccountRedirectAccountID', props.model.account?.id.toString());
     emitter?.emit("show-sign-in");
 };
 
 const manageAccountClicked = async () => {
-    localStorage.setItem('manageAccountMode', 'premium');
-    localStorage.setItem('manageAccountRedirectAccountID', props.model.account?.id.toString());
     emitter?.emit("show-manage-account");
 };
 
+const iveUpgradedClicked = async () => {
+    emit('updateUserPremium');
+};
+
+const showNoPremiumError = ref(false);
+
+emitter?.on(`x-premium-check-failed-${props.model.account.id}`, async () => {
+    showNoPremiumError.value = true;
+    setTimeout(() => {
+        showNoPremiumError.value = false;
+    }, 5000);
+});
+
 const backClicked = async () => {
     emit('setState', State.WizardReview);
 };
@@ -52,31 +62,31 @@ const backClicked = async () => {
         <ul v-if="!userAuthenticated || !userPremium">
             <li
                 v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.deleteTweets && model.account.xAccount?.deleteTweetsDaysOldEnabled">
-                Deleting tweets older than a set number of days
+                Delete tweets older than a set number of days
             </li>
             <li
                 v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.deleteTweets && model.account.xAccount?.deleteTweetsRetweetsThresholdEnabled">
-                Deleting tweets unless they have at least a certain number of retweets
+                Delete tweets unless they have at least a certain number of retweets
             </li>
             <li
                 v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.deleteTweets && model.account.xAccount?.deleteTweetsLikesThresholdEnabled">
-                Deleting tweets unless they have at least a certain number of likes
+                Delete tweets unless they have at least a certain number of likes
             </li>
             <li
                 v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.deleteRetweets && model.account.xAccount?.deleteRetweetsDaysOldEnabled">
-                Deleting retweets older than a set number of days
+                Delete retweets older than a set number of days
             </li>
             <li v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.unfollowEveryone">
-                Unfollowing everyone
+                Unfollow everyone
             </li>
             <li v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.deleteLikes">
-                Deleting likes
+                Delete likes
             </li>
             <li v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.deleteBookmarks">
-                Deleting bookmarks
+                Delete bookmarks
             </li>
             <li v-if="model.account.xAccount?.deleteMyData && model.account.xAccount?.deleteDMs">
-                Deleting direct messages
+                Delete direct messages
             </li>
         </ul>
 
@@ -98,11 +108,21 @@ const backClicked = async () => {
                     Sign In
                 </button>
 
-                <button v-else-if="userAuthenticated && !userPremium" type="submit"
-                    class="btn btn-lg btn-primary text-nowrap m-1" @click="manageAccountClicked">
-                    <i class="fa-solid fa-user-ninja" />
-                    Manage My Account
-                </button>
+                <div v-else-if="userAuthenticated && !userPremium">
+                    <button type="submit" class="btn btn-primary text-nowrap m-1" @click="manageAccountClicked">
+                        <i class="fa-solid fa-user-ninja" />
+                        Manage My Account
+                    </button>
+
+                    <button type="submit" class="btn btn-success text-nowrap m-1" @click="iveUpgradedClicked">
+                        <i class="fa-solid fa-star" />
+                        I've Upgraded
+                    </button>
+
+                    <div v-if="showNoPremiumError" class="alert alert-warning mt-4" role="alert">
+                        You haven't upgraded to Premium yet. Please try again.
+                    </div>
+                </div>
 
                 <button v-else type="submit" class="btn btn-lg btn-primary text-nowrap m-1" @click="backClicked">
                     <i class="fa-solid fa-user-ninja" />