diff --git a/src/views/settings.html b/src/views/settings.html
index 2f1637bd4..5b4db186e 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -228,11 +228,11 @@
       </div>
   </div>
 
-  <div class="text-left" ng-show="config.provider !== 'caas' && appstoreConfig.profile">
+  <div class="text-left" ng-show="config.provider !== 'caas'">
     <h3>Cloudron.io Account</h3>
   </div>
 
-  <div class="card" style="margin-bottom: 15px;" ng-show="config.provider !== 'caas' && appstoreConfig.profile">
+  <div class="card" style="margin-bottom: 15px;" ng-show="config.provider !== 'caas'">
       <div class="row">
           <div class="col-xs-12">
                 A Cloudron subscription provides access to the Cloudron App Store. This ensures you are running the latest version and keeps your apps and server secure.
@@ -265,7 +265,7 @@
       </div>
       <br/>
       <div class="row">
-          <div class="col-xs-12">
+          <div class="col-xs-12" ng-show="subscription">
               <a class="btn btn-primary pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-show="subscription.plan.id !== 'free' && appstoreConfig.profile.billing">Change Plan</a>
               <a class="btn btn-success pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=credit_card&email=' + appstoreConfig.profile.emailEncoded }}" target="_blank" ng-show="subscription.plan.id !== 'free' && !appstoreConfig.profile.billing">Setup Billing to keep your Subscription</a>
               <a class="btn btn-success pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-show="subscription.plan.id === 'free'">Setup Subscription</a>