diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js
index 4dbb111f79..1b641ab97a 100644
--- a/awx/ui/client/src/controllers/Projects.js
+++ b/awx/ui/client/src/controllers/Projects.js
@@ -392,6 +392,7 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
         master = {};
 
     // remove "type" field from search options
+    CredentialList = _.cloneDeep(CredentialList);
     CredentialList.fields.kind.noSearch = true;
 
     generator.inject(form, { mode: 'add', related: false, scope: $scope });
@@ -571,6 +572,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
         relatedSets = {};
 
     // remove "type" field from search options
+    CredentialList = _.cloneDeep(CredentialList);
     CredentialList.fields.kind.noSearch = true;
 
 
diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js
index 55b2419390..55a4a9aa5f 100644
--- a/awx/ui/client/src/helpers/JobTemplates.js
+++ b/awx/ui/client/src/helpers/JobTemplates.js
@@ -25,6 +25,7 @@ angular.module('JobTemplatesHelper', ['Utilities'])
                       return function(params) {
 
                           var scope = params.scope,
+                          CredentialList = _.cloneDeep(CredentialList),
                           defaultUrl = GetBasePath('job_templates'),
                           // generator = GenerateForm,
                           form = JobTemplateForm(),
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 a405f2bb52..a816cacd3a 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
@@ -13,6 +13,7 @@
             form = GroupForm();
 
         // remove "type" field from search options
+        CredentialList = _.cloneDeep(CredentialList);
         CredentialList.fields.kind.noSearch = true;
 
         $scope.formCancel = function(){
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 094b53399a..b008c0f888 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
@@ -15,6 +15,7 @@
             form = GroupForm();
 
         // remove "type" field from search options
+        CredentialList = _.cloneDeep(CredentialList);
         CredentialList.fields.kind.noSearch = true;
 
         $scope.formCancel = function(){
diff --git a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
index c893463c28..8a2f433dbc 100644
--- a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
+++ b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
@@ -47,6 +47,7 @@ export default
                 choicesCount = 0;
 
             // remove "type" field from search options
+            CredentialList = _.cloneDeep(CredentialList);
             CredentialList.fields.kind.noSearch = true;
 
             CallbackHelpInit({ scope: $scope });
@@ -471,7 +472,7 @@ export default
                             });
                     }
                     else {
-                        // job template doesn't exist 
+                        // job template doesn't exist
                         $scope.$emit("choicesReady");
                     }