diff --git a/oxTrust/server/src/main/java/org/gluu/oxtrust/action/UpdateAttributeAction.java b/oxTrust/server/src/main/java/org/gluu/oxtrust/action/UpdateAttributeAction.java
index 83cb65c4..2abdd661 100644
--- a/oxTrust/server/src/main/java/org/gluu/oxtrust/action/UpdateAttributeAction.java
+++ b/oxTrust/server/src/main/java/org/gluu/oxtrust/action/UpdateAttributeAction.java
@@ -279,6 +279,13 @@ public String saveImpl() {
                     return OxTrustConstants.RESULT_VALIDATION_ERROR;
                 }
 
+                if (attribute.getSaml1Uri() == null || attribute.getSaml1Uri().equals("")) {
+                    attribute.setSaml1Uri("urn:gluu:dir:attribute-def:" + attributeName);
+                }
+                if (attribute.getSaml2Uri() == null || attribute.getSaml2Uri().equals("")) {
+                    attribute.setSaml2Uri("urn:oid:" + attributeName);
+                }
+
                 attributeService.updateAttribute(this.attribute);
                 oxTrustAuditService.audit(
                         "ATTRIBUTE " + this.attribute.getInum() + " **" + this.attribute.getDisplayName()