1 files changed, 10 insertions, 1 deletions
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
index 563a66ba..5926adc6 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
@@ -23,6 +23,8 @@
 
 package at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks;
 
+import java.io.Serializable;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -93,7 +95,7 @@ public class CreateNewErnpEntryTask extends AbstractAuthServletTask {
            
       // finish matching process, because new user-entry uniquly matches
       log.info("User successfully registerred into ERnP and matching tasks are finished ");      
-      MatchingTaskUtils.setMatchingState(pendingReq, MatchingStates.BY_NEW_ERNP_ENTRY);
+      MatchingTaskUtils.setMatchingState(pendingReq, selectMatchingStateByContextInfos(executionContext)); 
       MatchingTaskUtils.storeFinalMatchingResult(pendingReq, 
           MatchedPersonResult.generateFormMatchingResult(
               resp.getPersonResult().get(0), simpleEidasData.getCitizenCountryCode()));
@@ -104,4 +106,11 @@ public class CreateNewErnpEntryTask extends AbstractAuthServletTask {
     }
   }
 
+  private MatchingStates selectMatchingStateByContextInfos(ExecutionContext executionContext) {            
+    Serializable flag = executionContext.get(Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_BY_USER_TASK);   
+    return flag != null && (boolean) flag 
+        ? MatchingStates.BY_USER_TO_NEW_ERNP_ENTRY : MatchingStates.BY_NEW_ERNP_ENTRY;  
+
+  }
+
 }