diff --git a/dashboard/src/views/settings.html b/dashboard/src/views/settings.html
index 6c37ca783..dffc05bb7 100644
--- a/dashboard/src/views/settings.html
+++ b/dashboard/src/views/settings.html
@@ -349,7 +349,8 @@
       <br/>
       <div class="row">
           <div class="col-xs-12">
-              <a class="btn btn-primary pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.email }}" target="_blank" ng-hide="subscription.plan.id === 'free'">Configure</a>
+              <a class="btn btn-primary pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.email }}" target="_blank" ng-show="subscription.plan.id !== 'free' && appstoreConfig.profile.billing">Configure</a>
+              <a class="btn btn-success pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=credit_card&email=' + appstoreConfig.profile.email }}" target="_blank" ng-show="subscription.plan.id !== 'free' && !appstoreConfig.profile.billing">Setup Billing</a>
               <a class="btn btn-success pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.email + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-show="subscription.plan.id === 'free'">Setup Subscription</a>
           </div>
       </div>