diff --git a/dashboard/src/components/CloudronAccount.vue b/dashboard/src/components/CloudronAccount.vue
index 7c4100841..030f148a5 100644
--- a/dashboard/src/components/CloudronAccount.vue
+++ b/dashboard/src/components/CloudronAccount.vue
@@ -63,7 +63,7 @@ onMounted(async () => {
         <div v-if="hasSubscription">
           <p>{{ $t('settings.appstoreAccount.description') }}</p>
 
-          <div class="info-row">
+          <div class="info-row" v-if="email">
             <div class="info-label">{{ $t('settings.appstoreAccount.email') }}</div>
             <!-- TODO change to setup subscxription -->
             <!-- TODO button is a link to console.cloudron.io/setup-subscription?cloudronId=xxx -->
@@ -82,10 +82,10 @@ onMounted(async () => {
 
           <p class="text-danger" v-show="cancelAt">{{ $t('settings.appstoreAccount.subscriptionEndsAt') }} {{ prettyDate(cancelAt*1000) }}</p>
 
-          <Button :href="`${consoleServerOrigin}/#/cloudron/${cloudronId}?email=${encodeURIComponent(email)}`" target="_blank">
-            <span v-show="planName === 'free'">{{ $t('settings.appstoreAccount.subscriptionSetupAction') }}</span>
-            <span v-show="cancelAt">{{ $t('settings.appstoreAccount.subscriptionReactivateAction') }}</span>
-            <span v-show="!cancelAt">{{ $t('settings.appstoreAccount.subscriptionChangeAction') }}</span>
+          <Button :href="`${consoleServerOrigin}/#/claim/${cloudronId}`" target="_blank">
+            <span v-if="planName.toLowerCase() === 'free'">{{ $t('settings.appstoreAccount.subscriptionSetupAction') }}</span>
+            <span v-else-if="cancelAt">{{ $t('settings.appstoreAccount.subscriptionReactivateAction') }}</span>
+            <span v-else>{{ $t('settings.appstoreAccount.subscriptionChangeAction') }}</span>
           </Button>
         </div>