diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index b265fe92..d71aa1a8 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -613,13 +613,7 @@ public class ApplicationDao {
                                 throw new IllegalArgumentException("Field value is not a valid number: " + fieldValue, e);
                             }
                     }
-
-                    // Add handler for isPecEmail
-                    if ("textinput".equals(fieldType) && Boolean.TRUE.equals(settingMap.get("isPecEmail"))) {
-                            applicationFormEntity.getApplication().setPecEmail(fieldValue.toString());
-                            log.info("Set PEC to {} for Application ID: {}", fieldValue, applicationFormEntity.getApplication().getId());
-                    }
-
+                    
                     if ("textinput".equals(fieldType) && Boolean.TRUE.equals(settingMap.get("isPIVA"))) {
                         applicationFormEntity.getApplication().setVatNumber(fieldValue.toString());
                         log.info("Set PEC to {} for Application ID: {}", fieldValue, applicationFormEntity.getApplication().getId());
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
index 8ce395d0..06811619 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.dao;
 
 import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.model.response.SettingResponseBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import net.gepafin.tendermanagement.config.Translator;
@@ -488,7 +489,17 @@ public class FormDao {
 
             FieldValidatorBean fieldValidatorBean  = Utils.convertSourceObjectToDestinationObject(contentResponseBean.getValidators(), FieldValidatorBean.class);
             String fieldValue = getFieldValue(contentResponseBean);
+            Map<String, Object> settingMap = contentResponseBean.getSettings().stream()
+                    .collect(Collectors.toMap(SettingResponseBean::getName, SettingResponseBean::getValue, (v1, v2) -> v1));
 
+            String fieldType = contentResponseBean.getName();
+            if(Boolean.TRUE.equals(isSendValidationError)){
+            if ("textinput".equals(fieldType) && Boolean.TRUE.equals(settingMap.get("isPecEmail"))) {
+                String pecEmail = (String) formFieldMap.get(contentResponseBean.getId());
+                applicationEntity.setPecEmail(pecEmail);
+            }
+                log.info("Set PEC to {} for Application ID: {}", fieldValue, applicationEntity.getId());
+            }
             validator.isRequired(value, fieldValidatorBean.getIsRequired(), fieldValue)
             .validateCustomTableValidation(value,fieldValidatorBean.getCustom(),fieldValue,contentResponseBean);
         });