diff --git a/src/index.html b/src/index.html
index ede949c34..ee7546ebf 100644
--- a/src/index.html
+++ b/src/index.html
@@ -101,7 +101,8 @@
             <h4 class="modal-title">Setup Subscription</h4>
           </div>
           <div class="modal-body">
-            <iframe ng-src="{{ config.webServerOrigin + '/helper/setup_subscription_info.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
+            <iframe ng-show="subscription.plan.id === 'free'" ng-src="{{ config.webServerOrigin + '/helper/setup_subscription_info.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
+            <iframe ng-show="subscription.plan.id === 'expired'" ng-src="{{ config.webServerOrigin + '/helper/subscription_expired.html?email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 100px; border: none;"></iframe>
           </div>
           <div class="modal-footer">
           </div>
@@ -128,10 +129,15 @@
 
                 <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
-                        <li ng-show="subscription.plan.id === 'free' || subscription.plan.id === 'expired'">
-                            <a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
-                                <span class="badge badge-success">Setup Subscription</span>
-                            </a>
+                        <li ng-show="subscription.plan.id === 'free'">
+                          <a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
+                            <span class="badge badge-success">Setup Subscription</span>
+                          </a>
+                        </li>
+                        <li ng-show="subscription.plan.id === 'expired'">
+                          <a ng-href="" ng-click="showSubscriptionModal()" style="cursor: pointer">
+                            <span class="badge badge-danger">Subscription expired</span>
+                          </a>
                         </li>
                         <li>
                             <a ng-class="{ active: isActive('/apps')}" href="#/apps"><i class="fa fa-cloud-download-alt fa-fw"></i> My Apps</a>