diff --git a/webadmin/src/index.html b/webadmin/src/index.html
index 48f558d95..203ff1955 100644
--- a/webadmin/src/index.html
+++ b/webadmin/src/index.html
@@ -153,7 +153,7 @@
                     See detailed information <a ng-href="{{ config.webServerOrigin + '/pricing.html' }}" target="_blank">here</a>.
                 </div>
                 <div class="modal-footer">
-                    <a class="btn btn-success" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions' }}" target="_blank">Setup</a>
+                    <a class="btn btn-success" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions' + appstoreConfig.profile.email }}" target="_blank">Setup</a>
                 </div>
             </div>
         </div>
@@ -172,7 +172,7 @@
                 </div>
                 <div class="modal-footer">
                     <a class="btn btn-default pull-left" ng-click="showUpdateModalFromVersion1Modal()">Maybe later</a>
-                    <a class="btn btn-success" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions' }}" target="_blank">Setup Update Subscription</a>
+                    <a class="btn btn-success" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions' + appstoreConfig.profile.email }}" target="_blank">Setup Update Subscription</a>
                 </div>
             </div>
         </div>
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 8759dca9f..c447401aa 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -348,8 +348,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' }}" target="_blank" ng-show="currentSubscription.plan && currentSubscription.plan.id !== 'free'">Change Subscription</a>
-            <a class="btn btn-success pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions' }}" target="_blank" ng-show="currentSubscription.plan.id === 'free'">Setup Subscription</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="currentSubscription.plan && currentSubscription.plan.id !== 'free'">Change Subscription</a>
+            <a class="btn btn-success pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.email }}" target="_blank" ng-show="currentSubscription.plan.id === 'free'">Setup Subscription</a>
         </div>
     </div>
 </div>