diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index 8d093e0b4544e7a648c40554b1f17bc44809541e..53d6cd77b401e2552ddc373e6f61446a886a49df 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -134,16 +134,11 @@ class sspmod_core_Auth_Process_TargetedID extends SimpleSAML_Auth_ProcessingFilt
 			if (isset($state['Destination']['entityid'])) {
 				$nameId->SPNameQualifier = $state['Destination']['entityid'];
 			}
-
-			$doc = \SAML2\DOMDocumentFactory::create();
-			$root = $doc->createElement('root');
-			$doc->appendChild($root);
-
-			$nameId->toXML($root);
-			$uid = $doc->saveXML($root->firstChild);
+		} else {
+			$nameId = $uid;
 		}
 
-		$state['Attributes']['eduPersonTargetedID'] = array($uid);
+		$state['Attributes']['eduPersonTargetedID'] = array($nameId);
 	}