diff --git a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue
index 13144963e2583592c445f5eabc3c142effceebee..4e5c0b309b18ba1f13ba55c852fa3c39bb7239fc 100644
--- a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue
@@ -99,8 +99,10 @@ export default {
             },
             set(newValue) {
                 const evaluation = { ...this.evaluation }
-
-                evaluation.measure_levels = this.evaluation.measure_levels.map(m => m.measure_id === this.measure.id ? ({...m, end_date : moment(newValue.startDate).format('YYYY-MM-DD') }) : m)
+                if (!this.expected_level && this.nextLevel) {
+                    this.expected_level = this.nextLevel;
+                }
+                evaluation.measure_levels = this.evaluation.measure_levels.map(m => m.measure_id === this.measure.id ? ({...m, end_date : moment(newValue.startDate).format('YYYY-MM-DD'), expected_level : parseInt(this.expected_level, 10) }) : m)
                 this.$store.commit('updateEvaluation', evaluation)
             }
         },
@@ -110,8 +112,10 @@ export default {
             },
             set(newValue) {
                 const evaluation = { ...this.evaluation }
-
-                evaluation.measure_levels = this.evaluation.measure_levels.map(m => m.measure_id === this.measure.id ? ({...m, manager : newValue }) : m)
+                if (!this.expected_level && this.nextLevel) {
+                    this.expected_level = this.nextLevel;
+                }
+                evaluation.measure_levels = this.evaluation.measure_levels.map(m => m.measure_id === this.measure.id ? ({...m, manager : newValue, expected_level : parseInt(this.expected_level, 10) }) : m)
                 this.$store.commit('updateEvaluation', evaluation)
             }
         },