diff --git a/static/directives/manage-users-tab.html b/static/directives/manage-users-tab.html
index c192fe06e..0245e928c 100644
--- a/static/directives/manage-users-tab.html
+++ b/static/directives/manage-users-tab.html
@@ -73,7 +73,7 @@
         </td>
         <td style="text-align: center;">
                   <span class="cor-options-menu"
-                        ng-if="((current_user.super_user && user.username == current_user.username) ||
+                        ng-if="((current_user.super_user && user.username == current_user.username && Features.QUOTA_MANAGEMENT) ||
                                !current_user.super_user) && !inReadOnlyMode">
                     <span class="cor-option" option-click="showChangeEmail(current_user)" ng-if="!current_user.super_user"
                           quay-show="Config.AUTHENTICATION_TYPE == 'Database' || Config.AUTHENTICATION_TYPE == 'AppToken'">
@@ -103,7 +103,7 @@
                       <i class="fa fa-bolt"></i> Take Ownership
                     </span>
                     <span class="cor-option" option-click="showQuotaConfig(current_user)"
-                        quay-show="Features.QUOTA_MANAGEMENT" ng-if="user.username == current_user.username">
+                        quay-show="Features.QUOTA_MANAGEMENT" ng-if="(current_user.super_user && user.username == current_user.username) || !current_user.super_user">
                       <i class="fa fa-gear"></i> Configure Quota
                     </span>
                   </span>
diff --git a/static/js/directives/ui/manage-user-tab.js b/static/js/directives/ui/manage-user-tab.js
index aba2c937c..59a026f23 100644
--- a/static/js/directives/ui/manage-user-tab.js
+++ b/static/js/directives/ui/manage-user-tab.js
@@ -15,7 +15,7 @@ angular.module('quay').directive('manageUserTab', function () {
                           TableService, Features, StateService) {
       $scope.inReadOnlyMode = StateService.inReadOnlyMode();
       $scope.Features = Features;
-      $scope.user = UserService.currentUser();
+      UserService.updateUserIn($scope);
       $scope.users = null;
       $scope.orderedUsers = [];
       $scope.usersPerPage = 10;
diff --git a/static/js/directives/ui/quota-management-view.js b/static/js/directives/ui/quota-management-view.js
index 644210ad7..6c72810d1 100644
--- a/static/js/directives/ui/quota-management-view.js
+++ b/static/js/directives/ui/quota-management-view.js
@@ -72,6 +72,10 @@ angular.module('quay').directive('quotaManagementView', function () {
       }
 
       var loadOrgQuota = function () {
+        if (!Features.QUOTA_MANAGEMENT) {
+          return;
+        }
+
         let params = null;
         let method = null;
         if ($scope.organization != null){