diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py
index 7b904c7975..31944e747b 100644
--- a/awx/main/models/credential.py
+++ b/awx/main/models/credential.py
@@ -215,6 +215,12 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
             raise ValidationError('Password required for VMware credential.')
         return password
 
+    def clean_project(self):
+        project = self.project or ''
+        if self.kind == 'openstack' and not project:
+            raise ValidationError('Project name required for OpenStack credential.')
+        return project
+
     def _validate_ssh_private_key(self, data):
         """Validate that the given SSH private key or certificate is,
         in fact, valid.