4 files changed, 15 insertions, 8 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 4fd1e8163..ac2594604 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -97,6 +97,7 @@ const messages = defineMessages({
 class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
+    isPremiumOverrideUser: PropTypes.bool.isRequired,
     isProUser: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
@@ -117,6 +118,7 @@ class AccountDashboard extends Component {
   render() {
     const {
       user,
+      isPremiumOverrideUser,
       isProUser,
       isLoading,
       userInfoRequestFailed,
@@ -213,7 +215,7 @@ class AccountDashboard extends Component {
                           {intl.formatMessage(messages.yourLicense)}
                         </H2>
                         <p>
-                          {planName}
+                          {isPremiumOverrideUser ? 'Franz Premium' : planName}
                           {user.team.isTrial && (
                             <>
                               {' – '}
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 2b5eba91c..9c74cf2ab 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -42,6 +42,7 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
       <ErrorBoundary>
         <AccountDashboard
           user={user.data}
+          isPremiumOverrideUser={user.isPremiumOverride}
           isProUser={user.isPro}
           isLoading={isLoadingUserInfo}
           isLoadingPlans={isLoadingPlans}
diff --git a/src/environment.js b/src/environment.js
index 9ec2acf9f..4be2c7d70 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,12 +1,12 @@
 import isDev from 'electron-is-dev';
 
 import {
-  // LIVE_API,
+  LIVE_API,
   DEV_API,
   LOCAL_API,
   LOCAL_API_WEBSITE,
   DEV_API_WEBSITE,
-  // LIVE_API_WEBSITE,
+  LIVE_API_WEBSITE,
   LIVE_WS_API,
   LOCAL_WS_API,
   DEV_WS_API,
@@ -36,11 +36,11 @@ let wsApi;
 let web;
 let todos;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
-  // api = LIVE_API;
-  api = DEV_API;
+  api = LIVE_API;
+  // api = DEV_API;
   wsApi = LIVE_WS_API;
-  // web = LIVE_API_WEBSITE;
-  web = DEV_API_WEBSITE;
+  web = LIVE_API_WEBSITE;
+  // web = DEV_API_WEBSITE;
   todos = PRODUCTION_TODOS_FRONTEND_URL;
 } else if (isDevMode && useLocalAPI) {
   api = LOCAL_API;
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index d44208923..365336cbf 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -160,6 +160,10 @@ export default class UserStore extends Store {
     return !!this.data.isPremium;
   }
 
+  @computed get isPremiumOverride() {
+    return (!this.team.plan && this.isPremium) || (this.team.state === 'expired' && this.isPremium);
+  }
+
   @computed get isPersonal() {
     if (!this.team.plan) return false;
     const plan = getPlan(this.team.plan);
@@ -168,7 +172,7 @@ export default class UserStore extends Store {
   }
 
   @computed get isPro() {
-    if ((!this.team.plan || this.team.state !== 'expired') && this.isPremium) return true;
+    if (this.isPremiumOverride) return true;
 
     if ((!this.team.plan || this.team.state === 'expired')) return false;
     const plan = getPlan(this.team.plan);