diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js
index 1dbbe33584..7db3e3cb2e 100644
--- a/awx/ui/client/src/helpers/JobTemplates.js
+++ b/awx/ui/client/src/helpers/JobTemplates.js
@@ -162,6 +162,8 @@ angular.module('JobTemplatesHelper', ['Utilities'])
                                       input_type: "radio"
                                   });
 
+                                  CredentialList.basePath = GetBasePath('credentials') + '?kind=ssh';
+
                                   LookUpInit({
                                       url: GetBasePath('credentials') + '?kind=ssh',
                                       scope: scope,
diff --git a/awx/ui/client/src/job-submission/job-submission.controller.js b/awx/ui/client/src/job-submission/job-submission.controller.js
index d059f9ec96..010fbb7af8 100644
--- a/awx/ui/client/src/job-submission/job-submission.controller.js
+++ b/awx/ui/client/src/job-submission/job-submission.controller.js
@@ -331,6 +331,7 @@ export default
                     var credential_url = GetBasePath('credentials') + '?kind=ssh';
 
                     var credList = _.cloneDeep(CredentialList);
+                    credList.basePath = GetBasePath('credentials') + '?kind=ssh';
                     credList.fields.description.searchable = false;
                     credList.fields.kind.searchable = false;