diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index edb69587..1a1a1598 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -1931,10 +1931,10 @@ public class ApplicationEvaluationDao {
         return convertToResponse(savedEntity);
     }
 
-    public ApplicationEvaluationResponseBean createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationFormId, Long evaluationId){
+    public ApplicationEvaluationResponseBean createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationFormId, Long assignedApplicationId){
         EvaluationFormEntity evaluationFormEntity = evaluationFormService.validateEvaluationForm(evaluationFormId);
         validateFormFields(applicationRequestBean,evaluationFormEntity);
-        ApplicationEvaluationEntity applicationEvaluationEntity = validateApplicationEvaluation(evaluationId);
+        ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationRepository.findByAssignedApplicationsId(assignedApplicationId);
         ApplicationEvaluationFormEntity applicationEvaluationFormEntity = getApplicationEvaluationFormOrCreate(evaluationFormEntity,applicationEvaluationEntity);
         createOrUpdateMultipleFormFields(applicationRequestBean.getFormFields(), applicationEvaluationFormEntity, evaluationFormEntity);
         return getEvaluationById(applicationEvaluationEntity.getId(),evaluationFormEntity.getId());
@@ -2001,7 +2001,7 @@ public class ApplicationEvaluationDao {
                                                                                              ApplicationEvaluationFormEntity applicationEvaluationFormEntity,
                                                                                              List<ApplicationEvaluationFormFieldEntity> applicationEvaluationFormFieldEntities,
                                                                                              EvaluationFormEntity evaluationFormEntity){
-        ApplicationEvaluationFormFieldEntity applicationEvaluationFormFieldEntity = null;
+        ApplicationEvaluationFormFieldEntity applicationEvaluationFormFieldEntity = new ApplicationEvaluationFormFieldEntity();
         validateFileUploadDocuments(applicationFormFieldRequestBean, evaluationFormEntity);
         VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
         ApplicationEvaluationFormFieldEntity oldApplicationEvaluationFormFieldData = null;
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java
index 539e55f9..9019aad4 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java
@@ -21,6 +21,9 @@ public interface ApplicationEvaluationRepository extends JpaRepository<Applicati
     Optional<ApplicationEvaluationEntity> findByIdAndIsDeletedFalse(Long id);
     Optional<ApplicationEvaluationEntity> findByAssignedApplicationsEntity_IdAndIsDeletedFalse(Long assignedApplicationId);
 
+    @Query("SELECT ae FROM ApplicationEvaluationEntity ae WHERE ae.assignedApplicationsEntity.id = :assignedApplicationId AND ae.isDeleted = false")
+    ApplicationEvaluationEntity findByAssignedApplicationsId(Long assignedApplicationId);
+
     Optional<ApplicationEvaluationEntity> findByApplicationIdAndAssignedApplicationsEntity_IdAndIsDeletedFalse(Long applicationId, Long assignedApplicationId);
 
     Optional<ApplicationEvaluationEntity> findFirstByIsDeletedFalseOrderByCreatedDateDesc();
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
index cfe4c9df..55da1766 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
@@ -87,10 +87,10 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
     }
 
     @Override
-    public ApplicationEvaluationResponseBean createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationId, Long evaluationFormId) {
-        ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(evaluationId);
-        validator.validatePreInstructor(request, applicationEvaluationEntity.getUserId());
-        return applicationEvaluationDao.createApplicationEvaluation(request,applicationRequestBean,evaluationFormId,evaluationId);
+    public ApplicationEvaluationResponseBean createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long assignedApplicationId, Long evaluationFormId) {
+        AssignedApplicationsEntity assignedApplicationsEntity = assignedApplicationsService.validateAssignedApplication(assignedApplicationId);
+        validator.validatePreInstructor(request, assignedApplicationsEntity.getUserId());
+        return applicationEvaluationDao.createApplicationEvaluation(request,applicationRequestBean,evaluationFormId,assignedApplicationId);
     }
 
     @Override
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java
index 1bbc6dac..0e59e6ac 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java
@@ -68,11 +68,11 @@ public interface ApplicationEvaluationApi {
                             @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
-    @PutMapping(value = "/{id}/form",
+    @PutMapping(value = "/assignedApplication/{id}",
             produces = { "application/json" })
     ResponseEntity<Response<ApplicationEvaluationResponseBean>> createApplicationEvaluation(HttpServletRequest request,
                                                                                             @Valid @RequestBody ApplicationRequestBean applicationRequestBean,
-                                                                                            @Parameter(description = "The evaluation id", required = true) @PathVariable(value = "id", required = true) Long id,
+                                                                                            @Parameter(description = "Assigned Application ID", required = true) @PathVariable(value = "id", required = true) Long assignedApplicationId,
                                                                                             @Parameter(description = "The evaluation form ID", required = true) @RequestParam("evaluationFormId") Long evaluationFormId);
 
     @Operation(summary = "Api to get an application evaluation form (Evaluation V2)",
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java
index de92247c..3a5df202 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java
@@ -85,13 +85,13 @@ public class ApplicationEvaluationApiController implements ApplicationEvaluation
     }
 
     @Override
-    public ResponseEntity<Response<ApplicationEvaluationResponseBean>> createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationId, Long evaluationFormId) {
+    public ResponseEntity<Response<ApplicationEvaluationResponseBean>> createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long assignedApplicationId, Long evaluationFormId) {
 
         /** This code is responsible for creating user action logs for the "Create or update application evaluation form" operation. **/
         loggingUtil.logUserAction(
                 UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE).actionContext(UserActionContextEnum.CREATE_UPDATE_APPLICATION_EVALUATION_FORM).build());
 
-        ApplicationEvaluationResponseBean applicationEvaluationResponseBean = applicationEvaluationService.createApplicationEvaluation(request, applicationRequestBean, evaluationId, evaluationFormId);
+        ApplicationEvaluationResponseBean applicationEvaluationResponseBean = applicationEvaluationService.createApplicationEvaluation(request, applicationRequestBean, assignedApplicationId, evaluationFormId);
 
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(new Response<>(applicationEvaluationResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_CREATED_SUCCESSFULLY)));