diff --git a/src/js/client.js b/src/js/client.js
index 736f8f918..f6685d588 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -3010,7 +3010,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         // basically the user has not setup appstore account yet
         if (!subscription.plan) return window.location.href = '/#/appstore';
 
-        window.open(this.getConfig().consoleServerOrigin + '/#/subscription_setup/' + subscription.cloudronId + '?email=' + subscription.emailEncoded, '_blank');
+        if (subscription.plan.id === 'free') window.open(this.getConfig().consoleServerOrigin + '/#/subscription_setup/' + subscription.cloudronId + '?email=' + subscription.emailEncoded, '_blank');
+        else window.open(this.getConfig().consoleServerOrigin + '/#/cloudron/' + subscription.cloudronId + '?email=' + subscription.emailEncoded, '_blank');
     };
 
     Client.prototype.getAppstoreAppByIdAndVersion = function (appId, version, callback) {