diff --git a/src/views/appstore.html b/src/views/appstore.html
index 2cd7a329d..e1d329158 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -149,11 +149,12 @@
           <p>Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.</p>
         </div>
         <div class="collapse" id="collapseSubscriptionRequired" data-toggle="false">
-          <iframe ng-src="{{ config.webServerOrigin + '/helper/' + appInstall.subscriptionHelperPage + '?appstoreId=' + appInstall.app.manifest.appstoreId + '&email=' + subscription.emailEncoded + '&cloudronId=' + subscription.cloudronId }}" style="width: 100%; height: 150px; border: none;"></iframe>
+          <p class="text-bold">A subscription for this Cloudron is required to install more apps.</p>
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default"data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-success pull-left" ng-click="openSubscriptionSetup()" ng-show="appInstall.state === 'subscriptionRequired'">Setup Subscription</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
         <button type="button" class="btn btn-danger" ng-show="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'" ng-click="appInstall.showForm()">Install</button>
         <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install {{ appInstall.needsOverwrite ? 'and overwrite DNS' : '' }}</button>
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 8e27c110e..8738db2c7 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -42,7 +42,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     $scope.appInstall = {
         busy: false,
         state: 'appInfo',
-        subscriptionHelperPage: '',
         error: {},
         app: {},
         needsOverwrite: false,
@@ -73,7 +72,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
             $scope.appInstall.domain = null;
             $scope.appInstall.portBindings = {};
             $scope.appInstall.state = 'appInfo';
-            $scope.appInstall.subscriptionHelperPage = '';
             $scope.appInstall.mediaLinks = [];
             $scope.appInstall.certificateFile = null;
             $scope.appInstall.certificateFileName = '';
@@ -220,14 +218,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                             $('#collapseResourceConstraint').collapse('hide');
                             $('#collapseInstallForm').collapse('hide');
                             $('#collapseSubscriptionRequired').collapse('show');
-
-                            if (error.message.indexOf('Upgrade to the premium') === 0) {
-                                $scope.appInstall.subscriptionHelperPage = 'app_install_premium_subscription_required.html';
-                            } else if (error.message.indexOf('The subscription for this Cloudron has expired.') === 0) {
-                                $scope.appInstall.subscriptionHelperPage = 'app_install_subscription_expired.html';
-                            } else {
-                                $scope.appInstall.subscriptionHelperPage = 'app_install_subscription_required.html';
-                            }
                         } else if (error.statusCode === 409) {
                             if (error.portName) {
                                 $scope.appInstall.error.port = error.message;
@@ -455,6 +445,14 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         });
     };
 
+    $scope.openSubscriptionSetup = function () {
+        Client.getSubscription(function (error, subscription) {
+            if (error) return console.error('Unable to get subscription.', error);
+
+            Client.openSubscriptionSetup(subscription);
+        });
+    };
+
     document.getElementById('appInstallCertificateFileInput').onchange = function (event) {
         $scope.$apply(function () {
             $scope.appInstall.certificateFile = null;