1 files changed, 8 insertions, 0 deletions
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java
index fb4e6e7b..0afe0ff6 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java
@@ -146,6 +146,14 @@ public class ReceiveOtherLoginMethodGuiResponseTask extends AbstractLocaleAuthSe
         return;        
         
       case ADD_ME_AS_NEW:
+        if (!MatchingTaskUtils.getIntermediateMatchingResult(pendingReq)
+            .getOperationStatus().isAllowErnpEntryByUser()) {
+          log.error("Create new ERnP entry by user was requested but it's not allowed!");
+          throw new TaskExecutionException(pendingReq, 
+              "Create new ERnP entry by user was requested but it's not allowed!", 
+              new EaafException("module.eidasauth.matching.98"));
+          
+        }
         log.info("User selects insert-into-ERnP option. Starting ERnP operation and complete prozess ... ");
         executionContext.put(Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_BY_USER_TASK, true);
         executionContext.put(Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK, false);