diff --git a/ghost/portal/src/components/common/PlansSection.js b/ghost/portal/src/components/common/PlansSection.js
index 65e8786c13..23acfab588 100644
--- a/ghost/portal/src/components/common/PlansSection.js
+++ b/ghost/portal/src/components/common/PlansSection.js
@@ -17,7 +17,7 @@ export const PlanSectionStyles = `
         font-size: 1.4rem;
         line-height: 1.35em;
         border-right: 1px solid var(--grey10);
-        padding: 16px;
+        padding: 16px 10px;
         cursor: pointer;
     }
 
@@ -185,6 +185,7 @@ function PlanOptions({plans, selectedPlan, onPlanSelect}) {
             planDetails.feature = 'Free preview';
             break;
         case 'Monthly':
+        case 'Complimentary':
             planDetails.feature = 'Full access';
             break;
         case 'Yearly':
diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js
index 46395f6008..32318b40b3 100644
--- a/ghost/portal/src/components/pages/AccountHomePage.js
+++ b/ghost/portal/src/components/pages/AccountHomePage.js
@@ -132,8 +132,16 @@ const PaidAccountActions = ({member, openUpdatePlan, onEditBilling}) => {
         if (defaultCardLast4) {
             return `**** **** **** ${defaultCardLast4}`;
         }
-        return `Complimentary`;
     };
+
+    let isComplimentary = false;
+    if (member && member.paid && member.subscriptions[0]) {
+        const {plan} = member.subscriptions[0];
+        if (plan.nickname === 'Complimentary') {
+            isComplimentary = true;
+        }
+    }
+
     if (member.paid) {
         const {subscriptions} = member;
         const {
@@ -145,18 +153,20 @@ const PaidAccountActions = ({member, openUpdatePlan, onEditBilling}) => {
                 <section>
                     <div className='gh-portal-list-detail'>
                         <h3>Plan</h3>
-                        <p>{getPlanLabel(plan)}</p>
+                        <p>{(isComplimentary ? 'Complimentary (' + getPlanLabel(plan) + ')' : getPlanLabel(plan))}</p>
                     </div>
-                    <button className='gh-portal-btn gh-portal-btn-list' onClick={e => openUpdatePlan(e)}>Change</button>
+                    {(!isComplimentary ? <button className='gh-portal-btn gh-portal-btn-list' onClick={e => openUpdatePlan(e)}>Change</button> : '')}
                 </section>
 
-                <section>
-                    <div className='gh-portal-list-detail'>
-                        <h3>Billing Info</h3>
-                        <p>{getCardLabel({defaultCardLast4})}</p>
-                    </div>
-                    <button className='gh-portal-btn gh-portal-btn-list' onClick={e => onEditBilling(e)}>Update</button>
-                </section>
+                {(!isComplimentary ? 
+                    <section>
+                        <div className='gh-portal-list-detail'>
+                            <h3>Billing Info</h3>
+                            <p>{getCardLabel({defaultCardLast4})}</p>
+                        </div>
+                        <button className='gh-portal-btn gh-portal-btn-list' onClick={e => onEditBilling(e)}>Update</button>
+                    </section>
+                    : '')}
             </>
         );
     }