diff --git a/ghost/portal/src/components/pages/AccountPlanPage.js b/ghost/portal/src/components/pages/AccountPlanPage.js
index 384070e19d..c0ce7de7e9 100644
--- a/ghost/portal/src/components/pages/AccountPlanPage.js
+++ b/ghost/portal/src/components/pages/AccountPlanPage.js
@@ -30,7 +30,7 @@ function getConfirmationPageTitle({confirmationType}) {
 }
 
 const Header = ({member, lastPage, brandColor, onBack, showConfirmation, confirmationType}) => {
-    let title = member.paid ? 'Change plan' : 'Choose a plan';
+    let title = isPaidMember({member}) ? 'Change plan' : 'Choose a plan';
     if (showConfirmation) {
         title = getConfirmationPageTitle({confirmationType});
     }
@@ -251,6 +251,15 @@ export default class AccountPlanPage extends React.Component {
         this.state = this.getInitialState();
     }
 
+    componentDidMount() {
+        const {member} = this.context;
+        if (!member) {
+            this.context.onAction('switchPage', {
+                page: 'signup'
+            });
+        }
+    }
+
     componentWillUnmount() {
         clearTimeout(this.timeoutId);
     }
@@ -296,7 +305,7 @@ export default class AccountPlanPage extends React.Component {
     onPlanCheckout(e, name) {
         const {onAction, member} = this.context;
         const {confirmationPlan, selectedPlan} = this.state;
-        if (member.paid) {
+        if (isPaidMember({member})) {
             const {subscriptions} = member;
             const subscriptionId = subscriptions[0].id;
             onAction('updateSubscription', {plan: confirmationPlan.name, subscriptionId, cancelAtPeriodEnd: false});
diff --git a/ghost/portal/src/utils/helpers.js b/ghost/portal/src/utils/helpers.js
index bc943afd58..a78a884d07 100644
--- a/ghost/portal/src/utils/helpers.js
+++ b/ghost/portal/src/utils/helpers.js
@@ -26,7 +26,7 @@ export function isCookiesDisabled() {
 }
 
 export function getMemberSubscription({member = {}}) {
-    if (member.paid) {
+    if (isPaidMember({member})) {
         const [subscription] = member.subscriptions || [];
         return subscription;
     }
@@ -64,7 +64,7 @@ export function getMemberActivePlan({member}) {
 }
 
 export function getSubscriptionFromId({member, subscriptionId}) {
-    if (member.paid) {
+    if (isPaidMember({member})) {
         const subscriptions = member.subscriptions || [];
         return subscriptions.find(d => d.id === subscriptionId);
     }