diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 8cbf5d64..3b1a11b3 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -455,16 +455,17 @@ public class ApplicationDao {
         if (applicationFormFieldEntities == null || applicationFormFieldEntities.isEmpty()) {
             applicationFormFieldEntity.setApplicationForm(applicationFormEntity);
         } else {
-        	applicationFormFieldEntity.setApplicationForm(applicationFormEntity);
             for (ApplicationFormFieldEntity applicationFormFieldEntity1 : applicationFormFieldEntities) {
-                if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) {
+                if (applicationFormFieldEntity1.getFieldId().equals(applicationFormFieldRequestBean.getFieldId())) {
                     applicationFormFieldEntity = applicationFormFieldEntity1;
                     oldApplicationFormFieldData = Utils.getClonedEntityForData(applicationFormFieldEntity);
-                    if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm())) {
+                    if (applicationFormEntity.getForm().getId().equals(applicationFormEntity.getApplication().getCall().getInitialForm()) && checkIfRequestFieldIsDifferent(applicationFormFieldEntity1, applicationFormFieldRequestBean)) {
                         validateRequiredFields(applicationFormEntity.getForm(), applicationFormEntity.getApplication(), applicationFormFieldRequestBean.getFieldId());
                     }
                     actionType = VersionActionTypeEnum.UPDATE;
                     break;
+                } else {
+                    applicationFormFieldEntity.setApplicationForm(applicationFormEntity);
                 }
             }
         }