diff --git a/app/Access/Saml2Service.php b/app/Access/Saml2Service.php
index 106a7a22906..9ba4470a2ac 100644
--- a/app/Access/Saml2Service.php
+++ b/app/Access/Saml2Service.php
@@ -65,8 +65,7 @@ public function logout(User $user): array
                 [],
                 $user->email,
                 $sessionIndex,
-                true,
-                Constants::NAMEID_EMAIL_ADDRESS
+                true
             );
             $id = $toolKit->getLastRequestID();
         } catch (Error $error) {
diff --git a/app/Config/saml2.php b/app/Config/saml2.php
index 44d06c5b2e6..c5d1e52a89d 100644
--- a/app/Config/saml2.php
+++ b/app/Config/saml2.php
@@ -78,7 +78,7 @@
             // Specifies constraints on the name identifier to be used to
             // represent the requested subject.
             // Take a look on lib/Saml2/Constants.php to see the NameIdFormat supported
-            'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
+            'NameIDFormat' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
 
             // Usually x509cert and privateKey of the SP are provided by files placed at
             // the certs folder. But we can also provide them with the following parameters