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