1 files changed, 10 insertions, 3 deletions
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java
index 9d4f7152..e67805d6 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java
@@ -92,13 +92,20 @@ public class GenerateOtherLoginMethodGuiTask extends AbstractLocaleAuthServletTa
           Constants.HTML_FORM_ENABLE_MATCHING_BY_ADDRESS_SEARCH, 
           String.valueOf(basicConfig.getBasicConfigurationBoolean(Constants.CONFIG_PROP_MATCHING_BY_ADDRESS)));
                         
-      // inject request to create a new ERnP entry
+      // inject flag to show screen for last manual matching step
       config.putCustomParameter(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_UIOPTIONS,
-          Constants.HTML_FORM_CREATE_NEW_ERNP_ENTRY, 
+          Constants.HTML_FORM_WITH_CREATE_NEW_ERNP_ENTRY_OPTION, 
           String.valueOf(
               MatchingTaskUtils.getExecutionContextFlag(
                   executionContext,Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK)));
-                        
+                          
+      // inject flag to disallow new ERnP entry in case of 
+      config.putCustomParameter(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_UIOPTIONS,
+          Constants.HTML_FORM_DISALLOW_CREATENEW_ERNP_ENTRY, 
+          String.valueOf(!MatchingTaskUtils.getIntermediateMatchingResult(pendingReq)
+              .getOperationStatus().isAllowErnpEntryByUser()));
+      
+      
       // reset executionContext parameters
       ReceiveOtherLoginMethodGuiResponseTask.ALL_EXECUTIONCONTEXT_PARAMETERS.forEach(
           el -> executionContext.remove(el));