diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 3d8a17d5..4ed09d15 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -131,5 +131,7 @@ public class GepafinConstant {
     public static final String CALL_NOT_PUBLISHED="call.not.published";
     public static final String APPLICATION_ALREADY_SUBMITTED="application.already.submitted";
     public static final String INITAL_AND_FINAL_FORM_CANNOT_NULL="initial.and.final.form.cannot.null";
+    public static final String APPLICATION_FORM_NOT_FOUND="application.form.not.found";
+    
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
index 8030f198..0df71aa8 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
@@ -234,11 +234,12 @@ public class FlowFormDao {
 				throw new CustomValidationException(Status.VALIDATION_ERROR,
 						Translator.toLocale(GepafinConstant.ACTION_REQUIRED));
 			}
-			formEntity = Optional
-					.of(applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(), formId))
-					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-							Translator.toLocale(GepafinConstant.FORM_NOT_FOUND)))
-					.getForm();
+//			formEntity = Optional
+//					.ofNullable(applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(), formId))
+//					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
+//							Translator.toLocale(GepafinConstant.APPLICATION_FORM_NOT_FOUND)))
+//					.getForm();
+			formEntity = formService.validateForm(formId);
 
 			if (action.equals(FormActionEnum.NEXT)) {
 				calculatedFormId = getNextForm(formEntity, applicationEntity);
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
index 7acec284..0cc4b2eb 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -114,9 +115,11 @@ public class FormDao {
     }
 
     public void validateFormField(List<ApplicationFormFieldRequestBean> applicationFormFieldRequestList, ApplicationEntity applicationEntity, FormEntity formEntity) {
+    	Map<String, String> formFieldMap = new LinkedHashMap<String, String>();
+    	for(ApplicationFormFieldRequestBean applicationFormFieldRequestBean:applicationFormFieldRequestList) {
+    		formFieldMap.put(applicationFormFieldRequestBean.getFieldId(),applicationFormFieldRequestBean.getFieldValue());
+    	}
 
-        Map<String, String> formFieldMap = applicationFormFieldRequestList.stream()
-                .collect(Collectors.toMap(ApplicationFormFieldRequestBean::getFieldId, ApplicationFormFieldRequestBean::getFieldValue));
         FormResponseBean formResponseBean = convertFormEntityToFormResponseBean(formEntity);
         ApplicationFormEntity applicationFormEntity=applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(),formEntity.getId());
         Boolean isApplicationFormExist= getApplicationFormExist(applicationFormEntity);
diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index b1ec7f96..cb423966 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -165,3 +165,4 @@ flow.not.found=Flow not found.
 validation.message=Validation messages.
 action.required=Action field required.
 call.not.published=Call is not published.
+application.form.not.found=Application form not found.
diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties
index 82bff2ee..0c47f666 100644
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -159,4 +159,5 @@ current.form.incomplete=il modulo corrente non � compilato
 flow.not.found=Flow not found.
 validation.message=Messaggi di convalida.
 action.required=Campo azione obbligatorio.
-call.not.published=La chiamata non è stata pubblicata.
\ No newline at end of file
+call.not.published=La chiamata non è stata pubblicata.
+application.form.not.found=Modulo di domanda non trovato.
\ No newline at end of file