diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 2c36b86c..ef01dea6 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -153,7 +153,7 @@ public class ApplicationEvaluationDao {
         Long hubId = application.getHubId();
         HubEntity hub = hubService.valdateHub(hubId);
 
-        Long initialDays = (hub != null) ? hub.getEvaluationExpirationDays() : 0L;
+        Long initialDays = (hub != null) ? hub.getEvaluationExpirationDays() : 30L;
 
         entity.setApplicationId(application.getId());
         entity.setAssignedApplicationsEntity(assignedApplications);
@@ -165,10 +165,10 @@ public class ApplicationEvaluationDao {
         entity.setMotivation(req.getMotivation());
         entity.setIsDeleted(false);
         entity.setInitialDays(initialDays);
-        entity.setRemainingDays(30L);
+        entity.setRemainingDays(initialDays);
         entity.setSuspendedDays(0L);
         entity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-        entity.setEndDate(DateTimeUtil.DateServerToUTC(application.getSubmissionDate().plusDays(30)));
+        entity.setEndDate(DateTimeUtil.DateServerToUTC(application.getSubmissionDate().plusDays(initialDays)));
         entity.setEvaluationVersion(application.getEvaluationVersion());
         entity.setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue());
         return entity;