diff --git a/src/service_provider/mod.rs b/src/service_provider/mod.rs
index a237052..2522a3c 100644
--- a/src/service_provider/mod.rs
+++ b/src/service_provider/mod.rs
@@ -236,11 +236,8 @@ impl ServiceProvider {
         self.authn_name_id_format
             .clone()
             .and_then(|v| -> Option<String> {
-                let unspecified = NameIdFormat::UnspecifiedNameIDFormat.value();
                 if v.is_empty() {
                     Some(NameIdFormat::TransientNameIDFormat.value().to_string())
-                } else if v == unspecified {
-                    None
                 } else {
                     Some(v)
                 }
@@ -478,9 +475,9 @@ impl ServiceProvider {
                 value: entity_id,
                 ..Issuer::default()
             }),
-            name_id_policy: Some(NameIdPolicy {
+            name_id_policy: self.name_id_format().map(|format| NameIdPolicy {
                 allow_create: Some(true),
-                format: self.name_id_format(),
+                format: Some(format),
                 ..NameIdPolicy::default()
             }),
             force_authn: Some(self.force_authn),