diff --git a/src/js/client.js b/src/js/client.js
index 2343b36af..736f8f918 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -3010,7 +3010,7 @@ 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, '_blank');
+        window.open(this.getConfig().consoleServerOrigin + '/#/subscription_setup/' + subscription.cloudronId + '?email=' + subscription.emailEncoded, '_blank');
     };
 
     Client.prototype.getAppstoreAppByIdAndVersion = function (appId, version, callback) {
diff --git a/src/views/settings.html b/src/views/settings.html
index 2706bf7bb..2531d3d83 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -171,7 +171,7 @@
           <span class="text-muted">{{ 'settings.appstoreAccount.email' | tr }}</span>
         </div>
         <div class="col-xs-6 text-right">
-          <a ng-href="{{ config.consoleServerOrigin }}" target="_blank">{{ subscription.email }} <i ng-show="!subscription.emailVerified" class="fas fa-exclamation-triangle text-danger" uib-tooltip="{{ 'settings.appstoreAccount.emailNotVerified' | tr }}"></i></a>
+          <a ng-href="{{ config.consoleServerOrigin }}?email={{ subscription.emailEncoded }}" target="_blank">{{ subscription.email }} <i ng-show="!subscription.emailVerified" class="fas fa-exclamation-triangle text-danger" uib-tooltip="{{ 'settings.appstoreAccount.emailNotVerified' | tr }}"></i></a>
         </div>
       </div>
       <div class="row" ng-show="subscription">