diff --git a/src/views/appstore.html b/src/views/appstore.html
index 2b8aaaeec..f1a10dfb5 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -146,19 +146,24 @@
                     <p ng-show="config.provider === 'caas'">Please upgrade to a bigger plan. Alternately, free up resources by uninstalling unused applications.</p>
                     <p ng-hide="config.provider === 'caas'">Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.</p>
                 </div>
-                <div class="collapse" id="postInstallMessage" data-toggle="false">
+                <div class="collapse" id="collapseAppLimitReached" data-toggle="false">
+                    <h4 class="text-danger">Subscription required to install more apps.</h4>
+                    <p>The free plan only contains 2 apps, signing up for a Cloudron subscription allows up to 20 apps. All apps will be automatically kept up-to-date via the appstore.</p>
+                  </div>
+                  <div class="collapse" id="postInstallMessage" data-toggle="false">
                     <div class="appstore-install-description">
-                        <div ng-bind-html="appInstall.app.manifest.postInstallMessage | postInstallMessage:appInstall.app | markdown2html"></div>
+                      <div ng-bind-html="appInstall.app.manifest.postInstallMessage | postInstallMessage:appInstall.app | markdown2html"></div>
                     </div>
+                  </div>
                 </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" ng-show="appInstall.state !== 'postInstall'" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-default" ng-show="appInstall.state === 'postInstall'" data-dismiss="modal" ng-click="appInstall.switchToAppsView()">Got it</button>
-                <button type="button" class="btn btn-success" ng-show="config.provider === 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="showView('/settings')">Upgrade Cloudron</button>
-                <button type="button" class="btn btn-danger" ng-show="config.provider !== 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
-                <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo' && user.admin" ng-click="appInstall.showForm()">Install</button>
-                <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm' && user.admin" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="appInstall.busy"></i> Install</button>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-default" ng-show="appInstall.state !== 'postInstall'" data-dismiss="modal">Close</button>
+                  <button type="button" class="btn btn-default" ng-show="appInstall.state === 'postInstall'" data-dismiss="modal" ng-click="appInstall.switchToAppsView()">Got it</button>
+                  <button type="button" class="btn btn-success" ng-show="config.provider === 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="showView('/settings')">Upgrade Cloudron</button>
+                  <button type="button" class="btn btn-danger" ng-show="config.provider !== 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
+                  <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo' && user.admin" ng-click="appInstall.showForm()">Install</button>
+                  <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm' && user.admin" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="appInstall.busy"></i> Install</button>
+                  <a class="btn btn-success" ng-show="appInstall.state === 'appLimitReached'" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank">Setup Subscription</a>
             </div>
         </div>
     </div>
diff --git a/src/views/appstore.js b/src/views/appstore.js
index a03e0cb4c..df7152dd0 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -74,8 +74,9 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
             $('#collapseInstallForm').collapse('hide');
             $('#collapseResourceConstraint').collapse('hide');
-            $('#collapseMediaLinksCarousel').collapse('show');
+            $('#collapseAppLimitReached').collapse('hide');
             $('#postInstallMessage').collapse('hide');
+            $('#collapseMediaLinksCarousel').collapse('show');
 
             if ($scope.appInstallForm) {
                 $scope.appInstallForm.$setPristine();
@@ -162,7 +163,13 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
             Client.installApp($scope.appInstall.app.id, $scope.appInstall.app.manifest, $scope.appInstall.app.title, data, function (error) {
                 if (error) {
-                    if (error.statusCode === 409 && (error.message.indexOf('is reserved') !== -1 || error.message.indexOf('is already in use') !== -1)) {
+                    if (error.statusCode === 402) {
+                        $scope.appInstall.state = 'appLimitReached';
+                        $('#collapseMediaLinksCarousel').collapse('hide');
+                        $('#collapseResourceConstraint').collapse('hide');
+                        $('#collapseInstallForm').collapse('hide');
+                        $('#collapseAppLimitReached').collapse('show');
+                    } else if (error.statusCode === 409 && (error.message.indexOf('is reserved') !== -1 || error.message.indexOf('is already in use') !== -1)) {
                         $scope.appInstall.error.port = error.message;
                     } else if (error.statusCode === 409) {
                         $scope.appInstall.error.location = 'This name is already taken.';
@@ -484,22 +491,30 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
             if (!result.token || !result.cloudronId) return callback();
 
-            $scope.appstoreConfig = result;
+            var appstoreConfig = result;
 
-            AppStore.getCloudronDetails(result, function (error) {
+            AppStore.getCloudronDetails(appstoreConfig, function (error) {
                 if (error) return callback(error);
 
-                $scope.validAppstoreAccount = true;
+                AppStore.getProfile(appstoreConfig.token, function (error, result) {
+                    if (error) return console.error(error);
 
-                // clear busy state when a login/signup was performed
-                $scope.appstoreLogin.busy = false;
+                    // assign late to avoid UI flicketing on update
+                    appstoreConfig.profile = result;
+                    $scope.appstoreConfig = appstoreConfig;
 
-                // also update the root controller status
-                $scope.$parent.fetchAppstoreProfileAndSubscription(function (error) {
-                    if (error) console.error(error);
+                    $scope.validAppstoreAccount = true;
+
+                    // clear busy state when a login/signup was performed
+                    $scope.appstoreLogin.busy = false;
+
+                    // also update the root controller status
+                    $scope.$parent.fetchAppstoreProfileAndSubscription(function (error) {
+                        if (error) console.error(error);
+                    });
+
+                    callback();
                 });
-
-                callback();
             });
         });
     }