diff --git a/awx/main/models/ad_hoc_commands.py b/awx/main/models/ad_hoc_commands.py
index c42d101ad9..07b9b89a7c 100644
--- a/awx/main/models/ad_hoc_commands.py
+++ b/awx/main/models/ad_hoc_commands.py
@@ -113,14 +113,10 @@ class AdHocCommand(UnifiedJob):
     @property
     def passwords_needed_to_start(self):
         '''Return list of password field names needed to start the job.'''
-        needed = []
         if self.credential:
-            for pw in self.credential.passwords_needed:
-                if pw == 'password':
-                    needed.append('ssh_password')
-                else:
-                    needed.append(pw)
-        return needed
+            return self.credential.passwords_needed
+        else:
+            return []
 
     @classmethod
     def _get_parent_field_name(cls):
diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py
index 6a2f838b97..8695d569d3 100644
--- a/awx/main/models/credential.py
+++ b/awx/main/models/credential.py
@@ -148,7 +148,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
     )
 
     @property
-    def needs_password(self):
+    def needs_ssh_password(self):
         return self.kind == 'ssh' and self.password == 'ASK'
 
     @property
@@ -176,7 +176,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
     @property
     def passwords_needed(self):
         needed = []
-        for field in ('password', 'become_password', 'ssh_key_unlock', 'vault_password'):
+        for field in ('ssh_password', 'become_password', 'ssh_key_unlock', 'vault_password'):
             if getattr(self, 'needs_%s' % field):
                 needed.append(field)
         return needed
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index cc5b4ad30a..300709a34a 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -140,14 +140,10 @@ class JobOptions(BaseModel):
     @property
     def passwords_needed_to_start(self):
         '''Return list of password field names needed to start the job.'''
-        needed = []
         if self.credential:
-            for pw in self.credential.passwords_needed:
-                if pw == 'password':
-                    needed.append('ssh_password')
-                else:
-                    needed.append(pw)
-        return needed
+            return self.credential.passwords_needed
+        else:
+            return []
 
 class JobTemplate(UnifiedJobTemplate, JobOptions):
     '''