diff --git a/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js b/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js
index 1cd819e009..ba4aa8ff32 100644
--- a/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js
+++ b/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js
@@ -55,6 +55,7 @@ export default
                 };
 
                 $scope.$watch('credentialKind', function(){
+                    $scope.credential_queryset.page = 1;
                     $scope.credential_default_params.credential_type = $scope.credential_queryset.credential_type = parseInt($scope.credentialKind);
 
                     qs.search(GetBasePath('credentials'), $scope.credential_default_params)
diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
index db65ad3834..4155a44d39 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
@@ -135,6 +135,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
                 };
 
                 $scope.$watch('credentialKind', function(){
+                    $scope.credential_queryset.page = 1;
                     $scope.credential_default_params.credential_type = $scope
                         .credential_queryset.credential_type = parseInt($scope
                             .credentialKind);