diff --git a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
index a3240de..a799b24 100644
--- a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
+++ b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
@@ -92,9 +92,17 @@ public class ScenarioExecutionService {
                 scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
                 scenarioOutput.setStatus("OK");
                 scenarioOutput.setStringOutput(scenarioExecution.getExecSharedMap().get("scenario_output").toString());
+                scenarioOutput.setMessage("");
             }else{
                 scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
                 scenarioOutput.setStatus("IN_PROGRESS");
+                scenarioOutput.setCurrentStepId(scenarioExecution.getCurrentStepId());
+                scenarioOutput.setCurrentStepDescription(scenarioExecution.getCurrentStepDescription());
+                if (scenarioOutput.getCurrentStepId() != null){
+                    scenarioOutput.setMessage("Executing "+scenarioOutput.getCurrentStepId()+"/"+scenarioExecution.getScenario().getSteps().size()+": "+scenarioOutput.getCurrentStepDescription()+".");
+                }else {
+                    scenarioOutput.setMessage("Starting execution...");
+                }
             }
             
             if(scenarioExecution.getLatestStepStatus()!= null && scenarioExecution.getLatestStepStatus().equals("ERROR")){