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 a45448016..bf41de0ef 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
@@ -30,9 +30,10 @@ class JsonSchemaBuilderService {
             resultNames.add(bundle.getName())
         })
 
-        result.addAll(customPropertiesConfiguration.getAttributes().collect {
-            it['name']
-        })
+        for (Map<String,String> attribute : customPropertiesConfiguration.getAttributes()) {
+            result.add(attribute.get("name"))
+            resultNames.add(attribute.get("displayName"))
+        }
 
         json['enum'] = result
         json['enumNames'] = resultNames