diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 7e26d9073..6794fe625 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -172,15 +172,11 @@
 
 <div class="card" style="margin-bottom: 15px;" ng-show="user.admin">
     <div class="row">
-        <div class="col-xs-12 text-center" ng-show="!appstoreAccount">
+        <div class="col-xs-12 text-center" ng-show="!appstoreConfig.userId">
             <button class="btn btn-success" ng-click="appstoreLogin.show()">Login to the Cloudron Store</button>
         </div>
-        <div class="col-xs-12" ng-show="appstoreAccount">
-            This Cloudron is using {{ appstoreAccount.email }}.
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-xs-12">
+        <div class="col-xs-12" ng-show="appstoreConfig.userId">
+            This Cloudron is using {{ appstoreConfig.userId }}.
         </div>
     </div>
 </div>
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index bb170c16e..c9b738053 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -7,6 +7,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
     $scope.dnsConfig = {};
+    $scope.appstoreConfig = {};
 
     $scope.lastBackup = null;
     $scope.backups = [];
@@ -380,6 +381,12 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
             $scope.currentPlan = $scope.config.plan;
             $scope.currency = $scope.config.currency === 'eur' ? '€' : '$';
+        } else {
+            Client.getAppstoreConfig(function (error, result) {
+                if (error) return console.error(error);
+
+                $scope.appstoreConfig = result;
+            });
         }
     });