diff --git a/src/views/support.html b/src/views/support.html
index 84eb02d4f..053e35f15 100644
--- a/src/views/support.html
+++ b/src/views/support.html
@@ -10,11 +10,14 @@
 
   <div class="card">
     <div class="grid-item-top">
-      <div class="row" ng-hide="config.features.support">
+      <div class="row" ng-hide="ready">
+        <h2 class="text-center"><i class="fa fa-circle-notch fa-spin"></i></h2>
+      </div>
+      <div class="row" ng-show="ready && !config.features.support">
         <p class="text-bold">{{ 'support.ticket.subscriptionRequired' | tr }}</p>
         <p ng-bind-html=" 'support.ticket.subscriptionRequiredDescription' | tr:{ supportViewLink: 'https://docs.cloudron.io/apps/?support_view', forumLink: 'https://forum.cloudron.io/' } "></p>
       </div>
-      <div class="row" ng-show="config.features.support">
+      <div class="row" ng-show="ready && config.features.support">
         <div class="col-lg-12">
           <div ng-show="subscription && !subscription.emailVerified">
             <p class="text-bold">{{ 'support.ticket.emailNotVerified' | tr:{ email: subscription.email } }}</p>
diff --git a/src/views/support.js b/src/views/support.js
index 8b1618a65..d37165e58 100644
--- a/src/views/support.js
+++ b/src/views/support.js
@@ -6,6 +6,7 @@
 angular.module('Application').controller('SupportController', ['$scope', '$location', 'Client', function ($scope, $location, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); });
 
+    $scope.ready = false;
     $scope.config = Client.getConfig();
     $scope.user = Client.getUserInfo();
     $scope.apps = Client.getInstalledApps();
@@ -86,28 +87,24 @@ angular.module('Application').controller('SupportController', ['$scope', '$locat
         });
     };
 
-    function getSubscription() {
+    Client.onReady(function () {
         Client.getSubscription(function (error, result) {
             if (error && error.statusCode === 412) return; // not yet registered
             if (error) return console.error(error);
 
-            console.log(result);
             $scope.subscription = result;
-        });
-    }
 
-    Client.onReady(function () {
-        getSubscription();
-
-        Client.getSupportConfig(function (error, supportConfig) {
-            if (error) return console.error(error);
-
-            $scope.supportConfig = supportConfig;
-
-            Client.getRemoteSupport(function (error, enabled) {
+            Client.getSupportConfig(function (error, supportConfig) {
                 if (error) return console.error(error);
 
-                $scope.sshSupportEnabled = enabled;
+                $scope.supportConfig = supportConfig;
+
+                Client.getRemoteSupport(function (error, enabled) {
+                    if (error) return console.error(error);
+
+                    $scope.sshSupportEnabled = enabled;
+                    $scope.ready = true;
+                });
             });
         });
     });