diff --git a/api/git/validate.go b/api/git/validate.go
index 2bf8375d7..04a27a55a 100644
--- a/api/git/validate.go
+++ b/api/git/validate.go
@@ -17,8 +17,8 @@ func ValidateRepoConfig(repoConfig *gittypes.RepoConfig) error {
 }
 
 func ValidateRepoAuthentication(auth *gittypes.GitAuthentication) error {
-	if auth != nil && govalidator.IsNull(auth.Password) {
-		return httperrors.NewInvalidPayloadError("Invalid repository credentials. Password must be specified when authentication is enabled")
+	if auth != nil && govalidator.IsNull(auth.Password) && auth.GitCredentialID == 0 {
+		return httperrors.NewInvalidPayloadError("Invalid repository credentials. Password or GitCredentialID must be specified when authentication is enabled")
 	}
 
 	return nil