diff --git a/src/index.html b/src/index.html
index e36963b1d..fbf666370 100644
--- a/src/index.html
+++ b/src/index.html
@@ -147,7 +147,13 @@
                   <ul class="nav navbar-nav navbar-right" ng-hide="hideNavBarActions">
                     <li ng-show="user.isAtLeastOwner && (subscription.plan.id === 'free' || subscription.plan.id === 'expired')">
                       <a ng-click="openSubscriptionSetup()" style="cursor: pointer">
-                        <span class="badge badge-success">{{ subscription.plan.id === 'free' ? 'Set up' : 'Reactivate' }} Subscription</span>
+                        <span class="badge badge-success" ng-show="subscription.plan.id === 'free'">Set up Subscription</span>
+                        <span class="badge badge-danger"  ng-show="subscription.plan.id !== 'free'">Reactivate Subscription</span>
+                      </a>
+                    </li>
+                    <li ng-show="!user.isAtLeastOwner && subscription.plan.id === 'expired'">
+                      <a>
+                        <span class="badge badge-danger">Subscription Expired</span>
                       </a>
                     </li>
                     <li>
diff --git a/src/js/client.js b/src/js/client.js
index 7f575d495..65eb6f5c6 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2864,8 +2864,6 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     };
 
     Client.prototype.getSubscription = function (callback) {
-        if (!this._userInfo.isAtLeastAdmin) return callback(new Error('Not allowed'));
-
         get('/api/v1/appstore/subscription', null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
diff --git a/src/js/main.js b/src/js/main.js
index 56d3d397e..80e432f5f 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -52,8 +52,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
 
     // NOTE: this function is exported and called from the appstore.js
     $scope.updateSubscriptionStatus = function () {
-        if (!Client.getUserInfo().isAtLeastAdmin) return;
-
         Client.getSubscription(function (error, subscription) {
             if (error && error.statusCode === 412) return; // ignore if not yet registered
             if (error && error.statusCode === 402) return; // ignore if not yet registered