diff --git a/awx/ui/client/src/credential-types/list/list.controller.js b/awx/ui/client/src/credential-types/list/list.controller.js
index c34f8c69e8..27c167923d 100644
--- a/awx/ui/client/src/credential-types/list/list.controller.js
+++ b/awx/ui/client/src/credential-types/list/list.controller.js
@@ -24,8 +24,10 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd("credential_types")
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
+                    $scope.options = params.options;
+                    optionsRequestDataProcessing();
                 });
 
             // search init
@@ -93,7 +95,7 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
 
                         // Set the item type label
                         if (list.fields.kind && $scope.options &&
-                            $scope.options.hasOwnProperty('kind')) {
+                            $scope.options.kind) {
                                 $scope.options.kind.choices.forEach(function(choice) {
                                     if (choice[0] === item.kind) {
                                         itm.kind_label = choice[1];
@@ -106,13 +108,6 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
             }
         }
 
-        Rest.setUrl(GetBasePath("credential_types"));
-        Rest.options()
-            .success(function(data) {
-                $scope.options = data.actions.GET;
-                optionsRequestDataProcessing();
-            });
-
         $scope.$watchCollection(`${$scope.list.name}`, function() {
                 optionsRequestDataProcessing();
             }
diff --git a/awx/ui/client/src/credentials/list/credentials-list.controller.js b/awx/ui/client/src/credentials/list/credentials-list.controller.js
index 06fb2a1ed8..fb0c903b4c 100644
--- a/awx/ui/client/src/credentials/list/credentials-list.controller.js
+++ b/awx/ui/client/src/credentials/list/credentials-list.controller.js
@@ -19,8 +19,8 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ClearScope',
 
         function init() {
             rbacUiControlService.canAdd('credentials')
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
 
             // search init
diff --git a/awx/ui/client/src/inventories/add/inventory-add.controller.js b/awx/ui/client/src/inventories/add/inventory-add.controller.js
index 4195bd5959..4287cfb404 100644
--- a/awx/ui/client/src/inventories/add/inventory-add.controller.js
+++ b/awx/ui/client/src/inventories/add/inventory-add.controller.js
@@ -17,8 +17,8 @@ function InventoriesAdd($scope, $location,
 
     $scope.canAdd = false;
     rbacUiControlService.canAdd(GetBasePath('inventory'))
-        .then(function(canAdd) {
-            $scope.canAdd = canAdd;
+        .then(function(params) {
+            $scope.canAdd = params.canAdd;
         });
 
     Rest.setUrl(GetBasePath('inventory'));
diff --git a/awx/ui/client/src/inventories/list/inventory-list.controller.js b/awx/ui/client/src/inventories/list/inventory-list.controller.js
index f538645975..2f43f48100 100644
--- a/awx/ui/client/src/inventories/list/inventory-list.controller.js
+++ b/awx/ui/client/src/inventories/list/inventory-list.controller.js
@@ -23,8 +23,8 @@ function InventoriesList($scope, $rootScope, $location,
         $scope.canAdd = false;
 
         rbacUiControlService.canAdd('inventory')
-            .then(function(canAdd) {
-                $scope.canAdd = canAdd;
+            .then(function(params) {
+                $scope.canAdd = params.canAdd;
             });
 
         $scope.$watchCollection(list.name, function(){
@@ -102,7 +102,7 @@ function InventoriesList($scope, $rootScope, $location,
         elem.removeAttr('ng-click');
         $compile(elem)($scope);
         $scope.triggerPopover(event);
-    } 
+    }
     if ($scope.removeHostSummaryReady) {
         $scope.removeHostSummaryReady();
     }
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
index 49d38fba62..a3fadb4ca7 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
@@ -17,8 +17,8 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', 'ParseTypeChang
             GenerateForm.applyDefaults(form, $scope);
 
         rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups")
-            .then(function(canAdd) {
-                $scope.canAdd = canAdd;
+            .then(function(params) {
+                $scope.canAdd = params.canAdd;
             });
             $scope.parseType = 'yaml';
             $scope.envParseType = 'yaml';
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
index 1355d5d33f..8be1854c23 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
@@ -13,8 +13,8 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', 'rbac
 
         function init() {
             rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups")
-                .then(function(canAdd) {
-                $scope.canAdd = canAdd;
+                .then(function(params) {
+                $scope.canAdd = params.canAdd;
             });
             // instantiate expected $scope values from inventorySourceData & groupData
             _.assign($scope, { credential: inventorySourceData.credential }, { overwrite: inventorySourceData.overwrite }, { overwrite_vars: inventorySourceData.overwrite_vars }, { update_on_launch: inventorySourceData.update_on_launch }, { update_cache_timeout: inventorySourceData.update_cache_timeout }, { instance_filters: inventorySourceData.instance_filters }, { inventory_script: inventorySourceData.source_script });
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
index ecbe611588..212d88850a 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
@@ -21,8 +21,8 @@
         $scope.canAdd = false;
 
         rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/groups")
-            .then(function(canAdd) {
-                $scope.canAdd = canAdd;
+            .then(function(params) {
+                $scope.canAdd = params.canAdd;
             });
 
             // Search init
diff --git a/awx/ui/client/src/inventories/manage/hosts/hosts-add.controller.js b/awx/ui/client/src/inventories/manage/hosts/hosts-add.controller.js
index 7042800ee2..15d44945ef 100644
--- a/awx/ui/client/src/inventories/manage/hosts/hosts-add.controller.js
+++ b/awx/ui/client/src/inventories/manage/hosts/hosts-add.controller.js
@@ -15,8 +15,8 @@ export default ['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/hosts")
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
             $scope.parseType = 'yaml';
             $scope.host = { enabled: true };
diff --git a/awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js b/awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
index ea9d76d9ec..278022e002 100644
--- a/awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
+++ b/awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
@@ -17,8 +17,8 @@
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/hosts")
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
 
             // Search init
diff --git a/awx/ui/client/src/inventory-scripts/list/list.controller.js b/awx/ui/client/src/inventory-scripts/list/list.controller.js
index 24f206d2d0..4aba6d6efb 100644
--- a/awx/ui/client/src/inventory-scripts/list/list.controller.js
+++ b/awx/ui/client/src/inventory-scripts/list/list.controller.js
@@ -19,8 +19,8 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd("inventory_scripts")
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
 
             // search init
diff --git a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
index c54df4e598..6d08e74b55 100644
--- a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
+++ b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
@@ -23,8 +23,8 @@
              $scope.canAdd = false;
 
              rbacUiControlService.canAdd("notification_templates")
-                 .then(function(canAdd) {
-                     $scope.canAdd = canAdd;
+                 .then(function(params) {
+                     $scope.canAdd = params.canAdd;
                  });
 
              // search init
diff --git a/awx/ui/client/src/organizations/list/organizations-list.controller.js b/awx/ui/client/src/organizations/list/organizations-list.controller.js
index b976a4a3f8..0711c21e01 100644
--- a/awx/ui/client/src/organizations/list/organizations-list.controller.js
+++ b/awx/ui/client/src/organizations/list/organizations-list.controller.js
@@ -23,8 +23,8 @@ export default ['$stateParams', '$scope', '$rootScope',
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd("organizations")
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
             $scope.orgCount = Dataset.data.count;
 
diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js
index 9a8f7d2e02..e70c12f44d 100644
--- a/awx/ui/client/src/projects/list/projects-list.controller.js
+++ b/awx/ui/client/src/projects/list/projects-list.controller.js
@@ -22,8 +22,8 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd('projects')
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
 
             // search init
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index 454220819d..819615bcb6 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -34,8 +34,8 @@ export default [
                 scheduleEndpoint = ParentObject.endpoint|| ParentObject.related.schedules || `${ParentObject.related.inventory_source}schedules`;
                 $scope.canAdd = false;
                 rbacUiControlService.canAdd(scheduleEndpoint)
-                    .then(function(canAdd) {
-                        $scope.canAdd = canAdd;
+                    .then(function(params) {
+                        $scope.canAdd = params.canAdd;
                     });
             }
 
diff --git a/awx/ui/client/src/shared/rbacUiControl.js b/awx/ui/client/src/shared/rbacUiControl.js
index 867fc4a6cb..ee74951d43 100644
--- a/awx/ui/client/src/shared/rbacUiControl.js
+++ b/awx/ui/client/src/shared/rbacUiControl.js
@@ -20,7 +20,7 @@ export default
                 Rest.options()
                     .success(function(data) {
                         if (data.actions.POST) {
-                            canAddVal.resolve(true);
+                            canAddVal.resolve({canAdd: true, options: data});
                         } else {
                             canAddVal.reject(false);
                         }
diff --git a/awx/ui/client/src/teams/list/teams-list.controller.js b/awx/ui/client/src/teams/list/teams-list.controller.js
index 1477452358..2e59cf0b42 100644
--- a/awx/ui/client/src/teams/list/teams-list.controller.js
+++ b/awx/ui/client/src/teams/list/teams-list.controller.js
@@ -21,8 +21,8 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt', 'ClearScope',
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd('teams')
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
             // search init
             $scope.list = list;
diff --git a/awx/ui/client/src/templates/list/templates-list.controller.js b/awx/ui/client/src/templates/list/templates-list.controller.js
index 397351ec6f..5cd54f1347 100644
--- a/awx/ui/client/src/templates/list/templates-list.controller.js
+++ b/awx/ui/client/src/templates/list/templates-list.controller.js
@@ -25,13 +25,13 @@ export default ['$scope', '$rootScope',
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd("job_templates")
-                .then(function(canAddJobTemplate) {
-                    $scope.canAddJobTemplate = canAddJobTemplate;
+                .then(function(params) {
+                    $scope.canAddJobTemplate = params.canAdd;
                 });
 
             rbacUiControlService.canAdd("workflow_job_templates")
-                .then(function(canAddWorkflowJobTemplate) {
-                    $scope.canAddWorkflowJobTemplate = canAddWorkflowJobTemplate;
+                .then(function(params) {
+                    $scope.canAddWorkflowJobTemplate = params.canAdd;
                 });
             // search init
             $scope.list = list;
diff --git a/awx/ui/client/src/users/list/users-list.controller.js b/awx/ui/client/src/users/list/users-list.controller.js
index 3eb05edb83..c443c634b2 100644
--- a/awx/ui/client/src/users/list/users-list.controller.js
+++ b/awx/ui/client/src/users/list/users-list.controller.js
@@ -34,8 +34,8 @@ export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt',
             $scope.canAdd = false;
 
             rbacUiControlService.canAdd('users')
-                .then(function(canAdd) {
-                    $scope.canAdd = canAdd;
+                .then(function(params) {
+                    $scope.canAdd = params.canAdd;
                 });
 
             // search init