diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
index adc9072fa..0df210269 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
@@ -57,6 +57,12 @@ public class CustomEntityAttributeDefinition implements IRelyingPartyOverridePro
     @Column(name = "persist_value", nullable = true)
     String persistValue;
     
+    @Override
+    public String getAttributeName() {
+        // This is a bit of a hack because we don't have attribute name in the UI yet...
+        return attributeName == null ? name : attributeName;
+    }
+    
     @Override
     public Set<String> getDefaultValues() {
         return customAttrListDefinitions;