diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index a9c2666b8..3c73bfbbf 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -129,7 +129,7 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1391: Regex Validation'                                     | '/SHIBUI-1391.side'
         'SHIBUI-1407: Metadata source comparison highlights'                | '/SHIBUI-1407-1.side'
         'SHIBUI-1407: Metadata provider comparison highlights'              | '/SHIBUI-1407-2.side'
-//        'SHIBUI-1503: Non-admin can create metadata source'                 | '/SHIBUI-1503-1.side' // Broken in this branch until UI fixes in
+        'SHIBUI-1503: Non-admin can create metadata source'                 | '/SHIBUI-1503-1.side'
         'SHIBUI-1503: User can be deleted'                                  | '/SHIBUI-1503-2.side'
         'SHIBUI-1503: User can be enabled'                                  | '/SHIBUI-1503-3.side'
         'SHIBUI-1732: Create, use, and delete CEA String'                   | '/SHIBUI-1732-1.side'
diff --git a/ui/src/app/metadata/hooks/utility.js b/ui/src/app/metadata/hooks/utility.js
index 0c21d3fe9..e11532ea9 100644
--- a/ui/src/app/metadata/hooks/utility.js
+++ b/ui/src/app/metadata/hooks/utility.js
@@ -132,7 +132,7 @@ export const assignValueToProperties = (models, properties, definition, schema)
             ...prop.items,
             enum: prop.items.enum.map((item, index) => ({
                 key: item,
-                label: `${prop?.items?.enumNames[index] || item}`,
+                label: `${prop?.items?.enumNames ? prop?.items?.enumNames[index] : item}`,
                 differences: models
                     .map((model) => {
                         const value = model[prop.id];