diff --git a/modules/saml/lib/Auth/Process/NameIDAttribute.php b/modules/saml/lib/Auth/Process/NameIDAttribute.php
index 26640e257d557bed0cb3859ad3bd14227b2ec06c..4959d2c97692ec58daf72f6d1a067c9d96ea6c5c 100644
--- a/modules/saml/lib/Auth/Process/NameIDAttribute.php
+++ b/modules/saml/lib/Auth/Process/NameIDAttribute.php
@@ -103,11 +103,11 @@ class sspmod_saml_Auth_Process_NameIDAttribute extends SimpleSAML_Auth_Processin
 		assert('isset($state["Source"]["entityid"])');
 		assert('isset($state["Destination"]["entityid"])');
 
-		if (!isset($state['saml:sp:State']['LogoutState']['saml:logout:NameID'])) {
+		if (!isset($state['saml:sp:NameID'])) {
 			return;
 		}
 
-		$rep = $state['saml:sp:State']['LogoutState']['saml:logout:NameID'];
+		$rep = $state['saml:sp:NameID'];
 		assert('isset($rep["Value"])');
 
 		$rep['%'] = '%';