diff --git a/modules/adfs/www/idp/prp.php b/modules/adfs/www/idp/prp.php
index ddb61938c18e37aee787b23fe4f1c7968c8d79b9..d26d74054ec0abc8c78bcba172ae071f0a093c3e 100644
--- a/modules/adfs/www/idp/prp.php
+++ b/modules/adfs/www/idp/prp.php
@@ -207,9 +207,11 @@ if (!$session->isValid($authority) ) {
 
 			$idpap = $adfsconfig->getValue('authproc');
 			if ($idpap) $idpap = array('authproc' => $idpap); else $idpap = array();
+			$idpap['entityid'] = $idpentityid;
 			
 			$spap = $spmetadata->getValue('authproc');
 			if ($spap) $spap = array('authproc' => $spap); else $spap = array();
+			$spap['entityid'] = $spentityid;
 			
 			$pc = new SimpleSAML_Auth_ProcessingChain($idpap, $spap, 'idp');