diff --git a/webadmin/src/js/main.js b/webadmin/src/js/main.js
index 63beb1b69..439fdd3ee 100644
--- a/webadmin/src/js/main.js
+++ b/webadmin/src/js/main.js
@@ -154,7 +154,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
         });
     }
 
-    function getSubscription() {
+    $scope.getSubscription = function () {
         Client.getAppstoreConfig(function (error, result) {
             if (error) return console.error(error);
 
@@ -239,7 +239,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
                     if ($scope.user.admin) {
                         runConfigurationChecks();
 
-                        if ($scope.config.provider !== 'caas') getSubscription();
+                        if ($scope.config.provider !== 'caas') $scope.getSubscription();
                     }
                 });
             });
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index fafdf48e6..c8668e5dc 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -310,6 +310,9 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
                             return;
                         }
 
+                        // check subscription right away after login
+                        $scope.$parent.getSubscription();
+
                         fetchAppstoreConfig();
                     });
                 });