diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py
index 8540be2ade..34a5b578b0 100644
--- a/awx/main/models/credential.py
+++ b/awx/main/models/credential.py
@@ -61,6 +61,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
     class Meta:
         app_label = 'main'
         ordering = ('kind', 'name')
+        unique_together = (('organization', 'name', 'kind'),)
 
     deprecated_user = models.ForeignKey(
         'auth.User',