diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/AttributeUtility.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/AttributeUtility.java
index 7677c1b56..1b23fd9ec 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/AttributeUtility.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/AttributeUtility.java
@@ -77,10 +77,10 @@ private edu.internet2.tier.shibboleth.admin.ui.domain.Attribute createNewAttribu
         edu.internet2.tier.shibboleth.admin.ui.domain.Attribute attribute = ((edu.internet2.tier.shibboleth.admin.ui.domain.AttributeBuilder) openSamlObjects.getBuilderFactory()
                 .getBuilder(edu.internet2.tier.shibboleth.admin.ui.domain.Attribute.DEFAULT_ELEMENT_NAME)).buildObject();
         attribute.setName(name);
+        attribute.setNameFormat(URI); // SHIBUI-2173
         if (friendlyName != null) {
             attribute.setFriendlyName(friendlyName);
-            attribute.setNameFormat(URI);
         }
         return attribute;
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
index f61d647fe..28ba48d30 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -94,7 +94,7 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest {
         <saml:AttributeValue>givenName</saml:AttributeValue>
         <saml:AttributeValue>employeeNumber</saml:AttributeValue>
       </saml:Attribute>
-      <saml2:Attribute xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://shibboleth.net/ns/attributes/releaseAllValues">
+      <saml2:Attribute xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://shibboleth.net/ns/attributes/releaseAllValues" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml2:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">testme</saml2:AttributeValue>
       </saml2:Attribute>
     </mdattr:EntityAttributes>