diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index cc438bd013..8d937fcfb0 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -221,7 +221,6 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
     playbook) to an inventory source with a given credential.
     '''
     SOFT_UNIQUE_TOGETHER = [('polymorphic_ctype', 'name')]
-    PASSWORD_FIELDS = ('credential', 'vault_credential')
 
     class Meta:
         app_label = 'main'
diff --git a/awx/main/tests/unit/api/test_filters.py b/awx/main/tests/unit/api/test_filters.py
index e4ea8e07bf..1b8007a516 100644
--- a/awx/main/tests/unit/api/test_filters.py
+++ b/awx/main/tests/unit/api/test_filters.py
@@ -53,16 +53,6 @@ def test_filter_on_password_field(password_field, lookup_suffix):
     assert 'not allowed' in str(excinfo.value)
 
 
-@pytest.mark.parametrize('lookup_suffix', ['', 'contains', 'startswith', 'in'])
-@pytest.mark.parametrize('password_field', Credential.PASSWORD_FIELDS)
-def test_filter_on_related_password_field(password_field, lookup_suffix):
-    field_lookup = FieldLookupBackend()
-    lookup = '__'.join(filter(None, ['credential', password_field, lookup_suffix]))
-    with pytest.raises(PermissionDenied) as excinfo:
-        field, new_lookup = field_lookup.get_field_from_lookup(JobTemplate, lookup)
-    assert 'not allowed' in str(excinfo.value)
-
-
 @pytest.mark.parametrize('model, query', [
     (AuthToken, 'request_hash__icontains'),
     (User, 'password__icontains'),
diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index dfda8d26de..b8045c8ac3 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -381,8 +381,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                             value: {
                                 page_size: '5',
                                 order_by: 'name',
-                                inventory__isnull: false,
-                                credential__isnull: false
+                                inventory__isnull: false
                             },
                             squash: false,
                             dynamic: true