diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
index 34bbd75d..8030f198 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
@@ -267,9 +267,16 @@ public class FlowFormDao {
 		if (flowEdgesList.size() == 1) {
 			totalFormSteps = 2l;
 		}
+		Long currentStep = 2l;
+		if (formEntity.getId().equals(formEntity.getCall().getInitialForm())) {
+			currentStep = 1l;
+		} else if (formEntity.getId().equals(formEntity.getCall().getFinalForm())) {
+			currentStep = 3l;
+		}
 		List<ApplicationFormEntity> applicationFormList = applicationFormRepository.findByApplicationId(applicationEntity.getId());
 		nextOrPreviousFormResponse.setTotalFormSteps(totalFormSteps);
 		nextOrPreviousFormResponse.setCompletedSteps(Long.valueOf(applicationFormList.size()));
+		nextOrPreviousFormResponse.setCurrentStep(currentStep);
 		return nextOrPreviousFormResponse;
 	}
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java
index 37fb1d9b..55ee34be 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java
@@ -15,6 +15,8 @@ public class NextOrPreviousFormResponse {
 	
 	private Long completedSteps;
 	
+	private Long currentStep;
+	
 	private FormApplicationResponse applicationFormResponse;
 
 }
\ No newline at end of file