1 files changed, 3 insertions, 2 deletions
diff --git a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
index 2141fee8..f044c259 100644
--- a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
+++ b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import at.asitplus.eidas.specific.modules.auth.idaustria.IdAustriaAuthConstants;
 import at.asitplus.eidas.specific.modules.auth.idaustria.utils.IdAustriaAuthCredentialProvider;
 import at.asitplus.eidas.specific.modules.auth.idaustria.utils.IdAustriaAuthMetadataProvider;
+import at.asitplus.eidas.specific.modules.auth.idaustria.utils.Utils;
 import at.asitplus.eidas.specific.modules.msproxyservice.MsProxyServiceConstants;
 import at.gv.egiz.eaaf.core.api.data.PvpAttributeDefinitions;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
@@ -143,8 +144,8 @@ public class ReceiveFromIdAustriaSystemTask extends AbstractAuthServletTask {
 
       } else {
         // validate entityId of response
-        final String idAustriaEntityID = authConfig.getBasicConfiguration(
-            IdAustriaAuthConstants.CONFIG_PROPS_IDAUSTRIA_ENTITYID);
+        final String idAustriaEntityID =
+            Utils.getIdAustriaEntityId(pendingReq.getServiceProviderConfiguration(), authConfig); 
         final String respEntityId = msg.getEntityID();
         if (!idAustriaEntityID.equals(respEntityId)) {
           log.warn("Response Issuer is not a 'ID Austria System'. Stopping eIDAS authentication ...");