diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index 055f03f06f6660112d774288cf7d603d9ff25b2e..939ef9efc9dbf1c16a2ce642c46295836d9b3053 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -134,7 +134,7 @@ class sspmod_core_Auth_Process_TargetedID extends SimpleSAML_Auth_ProcessingFilt
 				$nameId['NameQualifier'] = $state['Source']['entityid'];
 			}
 			if (isset($state['Destination']['entityid'])) {
-				$nameId['SPNameQualifier'] = $state['Source']['entityid'];
+				$nameId['SPNameQualifier'] = $state['Destination']['entityid'];
 			}
 
 			$doc = new DOMDocument();