diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
index dd8bf8954..6ce2668a4 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -33,6 +33,9 @@ class JsonSchemaBuilderService {
         result.addAll(customPropertiesConfiguration.getAttributes().collect {
             it['name']
         })
+        resultNames.addAll(customPropertiesConfiguration.getAttributes().collect {
+            it['name']
+        })
 
         json['enum'] = result
         json['enumNames'] = resultNames