diff --git a/src/index.html b/src/index.html
index b22575d3d..467e6c1a9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -98,7 +98,7 @@
                 </div>
                 <div class="modal-body">
                     <p ng-show="config.update.box">
-                        You can update to the next version once you have <a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.email + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank">setup billing</a>.
+                        You can update to the next version once you have <a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank">setup billing</a>.
                     </p>
                     <p>
                         A Cloudron subscription provides access to the Cloudron App Store. This ensures you are running the latest version
@@ -106,7 +106,7 @@
                     </p>
                 </div>
                 <div class="modal-footer">
-                    <a class="btn btn-success" ng-click="waitForPlanSelection()" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.email + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-disabled="waitingForPlanSelection"><i class="fa fa-circle-o-notch fa-spin" ng-show="waitingForPlanSelection"></i> Setup Subscription</a>
+                    <a class="btn btn-success" ng-click="waitForPlanSelection()" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-disabled="waitingForPlanSelection"><i class="fa fa-circle-o-notch fa-spin" ng-show="waitingForPlanSelection"></i> Setup Subscription</a>
                 </div>
             </div>
         </div>
@@ -137,7 +137,7 @@
                             </a>
                         </li>
                         <li ng-show="ready && subscription && subscription.status === 'trialing' && !appstoreConfig.profile.billing">
-                            <a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=credit_card&email=' + appstoreConfig.profile.email }}" target="_blank">
+                            <a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=credit_card&email=' + appstoreConfig.profile.emailEncoded }}" target="_blank">
                                 <span class="badge badge-success">IN TRIAL - SETUP BILLING HERE</span>
                             </a>
                         </li>
diff --git a/src/js/appstore.js b/src/js/appstore.js
index dad8bcc19..bdaf02314 100644
--- a/src/js/appstore.js
+++ b/src/js/appstore.js
@@ -176,6 +176,10 @@ angular.module('Application').service('AppStore', ['$http', '$base64', 'Client',
 
         $http.get(Client.getConfig().apiServerOrigin + '/api/v1/profile', { params: { accessToken: token }}).success(function (data, status) {
             if (status !== 200) return callback(new AppStoreError(status, data));
+
+            // just some helper property, since angular bindings cannot dot his easily
+            data.profile.emailEncoded = encodeURIComponent(data.profile.email);
+
             return callback(null, data.profile);
         }).error(function (data, status) {
             return callback(new AppStoreError(status, data));
diff --git a/src/views/settings.html b/src/views/settings.html
index 69cceb9c6..99a4a8bc8 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -390,7 +390,7 @@
               <span class="text-muted">Account Email</span>
           </div>
           <div class="col-xs-6 text-right">
-              <a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?email=' + appstoreConfig.profile.email }}" target="_blank">{{ appstoreConfig.profile.email }}</a>
+              <a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?email=' + appstoreConfig.profile.emailEncoded }}" target="_blank">{{ appstoreConfig.profile.email }}</a>
           </div>
       </div>
       <div class="row">
@@ -412,9 +412,9 @@
       <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 + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-show="subscription.plan.id !== 'free' && appstoreConfig.profile.billing">Change Plan</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>
+              <a class="btn btn-primary pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-show="subscription.plan.id !== 'free' && appstoreConfig.profile.billing">Change Plan</a>
+              <a class="btn btn-success pull-right" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=credit_card&email=' + appstoreConfig.profile.emailEncoded }}" 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.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank" ng-show="subscription.plan.id === 'free'">Setup Subscription</a>
           </div>
       </div>
   </div>