1 files changed, 5 insertions, 4 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
index ae89a4a0..34e258ca 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
@@ -69,6 +69,7 @@ public class InitialSearchTask extends AbstractAuthServletTask {
   private final IErnpClient ernpClient;
   private final IZmrClient zmrClient;
   private ExecutionContext executionContext;
+
   /**
    * Constructor.
    * @param handlers List of countrySpecificSearchProcessors
@@ -97,6 +98,7 @@ public class InitialSearchTask extends AbstractAuthServletTask {
 
       String bpK = step2RegisterSearchWithPersonidentifier(eidData);
       authProcessData.setGenericDataToSession(Constants.DATA_RESULT_MATCHING_BPK, bpK);
+      authProcessData.setGenericDataToSession(Constants.DATA_SIMPLE_EIDAS, eidasResponse);
     } catch (final Exception e) {
       log.error("Initial search FAILED.", e);
       throw new TaskExecutionException(pendingReq, "Initial search FAILED.", e);
@@ -154,7 +156,7 @@ public class InitialSearchTask extends AbstractAuthServletTask {
       }
     }
     if (foundHandler == null) {
-      return step8RegisterSearchWithMds(result, eidData);
+      return step8RegisterSearchWithMds(eidData);
     } else {
       return step6CountrySpecificSearch(foundHandler, result, eidData);
     }
@@ -169,7 +171,7 @@ public class InitialSearchTask extends AbstractAuthServletTask {
 
     switch (countrySpecificDetailSearchResult.getResultCount()) {
       case 0:
-        return step8RegisterSearchWithMds(initialSearchResult, eidData);
+        return step8RegisterSearchWithMds(eidData);
       case 1:
         return step7aKittProcess(initialSearchResult, countrySpecificDetailSearchResult, eidData);
       default:
@@ -202,8 +204,7 @@ public class InitialSearchTask extends AbstractAuthServletTask {
     }
   }
 
-  private String step8RegisterSearchWithMds(MergedRegisterSearchResult initialSearchResult,
-                                            SimpleEidasData eidData) {
+  private String step8RegisterSearchWithMds(SimpleEidasData eidData) {
     log.trace("Starting step8RegisterSearchWithMds");
     List<RegisterResult> resultsZmr =
         zmrClient.searchWithMds(eidData.getGivenName(), eidData.getFamilyName(), eidData.getDateOfBirth());