diff --git a/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js b/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js
index 0669f49882..ea05241b5a 100644
--- a/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js
+++ b/apps/portal/src/components/pages/AccountHomePage/components/AccountWelcome.js
@@ -32,6 +32,10 @@ const AccountWelcome = () => {
             return null;
         }
 
+        if (isComplimentary) {
+            return null;
+        }
+
         if (subscriptionHasFreeTrial({sub: subscription})) {
             const trialEnd = getDateString(subscription.trial_end_at);
             return (
diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs
index d301aadf30..7813d11375 100644
--- a/ghost/admin/app/components/gh-member-settings-form.hbs
+++ b/ghost/admin/app/components/gh-member-settings-form.hbs
@@ -143,11 +143,21 @@
                                         {{else}}
                                             {{#if (or (eq sub.price.nickname "Monthly") (eq sub.price.nickname "Yearly"))}}
                                             {{else}}
-                                                <span class="gh-cp-membertier-pricelabel">{{sub.price.nickname}}</span><span class="gh-cp-membertier-renewal"> &ndash; </span>
+                                                <span class="gh-cp-membertier-pricelabel">{{sub.price.nickname}}</span>
                                             {{/if}}
                                         {{/if}}
 
-                                         <span class="gh-cp-membertier-renewal">{{sub.validityDetails}}</span>
+                                        {{#if sub.trialUntil}}
+                                            <span class="gh-cp-membertier-renewal"> &ndash; </span>
+                                            <span class="gh-cp-membertier-renewal">{{sub.validityDetails}}</span>
+                                        {{/if}}
+
+                                        {{#if sub.compExpiry}}
+                                            <span class="gh-cp-membertier-renewal"> &ndash; </span>
+                                            <span class="gh-cp-membertier-renewal">{{sub.validityDetails}}</span>
+                                        {{/if}}
+
+                                         
                                     </div>
                                     <Member::SubscriptionDetailBox @sub={{sub}} @index={{index}} />
                                 </div>