diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
index 77887539..aaea72e8 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
@@ -76,9 +76,19 @@ public class ApplicationServiceImpl implements ApplicationService {
     @Override
     public NextOrPreviousFormResponse getNextOrPreviousForm(HttpServletRequest request, Long applicationId, Long companyId, Long formId,
                                                             FormActionEnum action) {
-        validator.validateUserWithCompany(request, companyId);
-        validateApplication(applicationId);
-        ApplicationEntity applicationEntity = validateApplicationWithCompany(applicationId, companyId);
+      if (companyId !=null) {
+          validator.validateUserWithCompany(request, companyId);
+      }
+        ApplicationEntity applicationEntity =null;
+        if(validator.checkIsBeneficiary()){
+          if(companyId==null){
+              throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.COMPANY_ID_MANDATORY));
+          }
+          applicationEntity = validateApplicationWithCompany(applicationId, companyId);
+
+      }else {
+         applicationEntity=validateApplication(applicationId);
+        }
         return flowFormDao.getNextOrPreviousForm(applicationEntity, companyId, formId, action);
     }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
index bc2f3cb9..9db1d79e 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
@@ -114,7 +114,7 @@ public interface ApplicationApi {
     @GetMapping(value = "/{applicationId}/form/next-previous", produces = "application/json")
     ResponseEntity<Response<NextOrPreviousFormResponse>> getNextOrPreviousForm(HttpServletRequest request,
 					 @Parameter(description = "The applicaltion id", required = true) @PathVariable("applicationId") Long applicationId,
-					 @Parameter(description = "The company id", required = true) @RequestParam("companyId") Long companyId,
+					 @Parameter(description = "The company id", required = false) @RequestParam(value = "companyId",required = false) Long companyId,
                      @Parameter(description = "The form id", required = false) @RequestParam(value = "formId", required = false) Long formId,
                      @RequestParam(value = "action", required = false) FormActionEnum action);