diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
index f46e61f5..a6f6a867 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
@@ -243,11 +243,11 @@ public class FlowFormDao {
 				.map(FlowEdgesEntity::getSourceId)
 				.toList();
 
-		List<FormEntity> previousForms = formRepository.findByIdIn(previousFormIds);
+		List<ApplicationFormEntity> applicationFormEntities=applicationFormRepository.findByFormIdInAndApplicationId(previousFormIds,applicationEntity.getId());
 
-		previousForms.sort(Comparator.comparing(FormEntity::getCreatedDate).reversed());
+		applicationFormEntities.sort(Comparator.comparing(ApplicationFormEntity::getCreatedDate).reversed());
 
-		return previousForms.isEmpty() ? null : previousForms.get(0).getId();
+		return applicationFormEntities.isEmpty() ? null : applicationFormEntities.get(0).getForm().getId();
 	}
 	public NextOrPreviousFormResponse getnextOrPreviousForm(ApplicationEntity applicationEntity, Long formId,
 			FormActionEnum action) {
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
index 11a27915..57568468 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
@@ -221,7 +221,9 @@ public class FormDao {
                     .validateCustom(value, fieldValidatorBean.getCustom(), fieldId);  // Add the custom validation here
             if (fieldValidatorBean.getCustom() != null && fieldValidatorBean.getCustom().equals(GepafinConstant.IS_PIVA)) {
                String error = validateVatNumber(value, fieldValidatorBean.getCustom(), fieldId);
-               validator.addError(error);
+              if(error != null) {
+                  validator.addError(error);
+              }
            }
         });
         validator.validate();
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormRepository.java
index 992eece3..1037402a 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationFormRepository.java
@@ -17,4 +17,5 @@ public interface ApplicationFormRepository extends JpaRepository<ApplicationForm
 
 	public List<ApplicationFormEntity> findByApplicationIdOrderByCreatedDateAsc(Long applicationId);
 
+    public List<ApplicationFormEntity> findByFormIdInAndApplicationId(List<Long> formIds,Long applicationId);
 }