diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index d298b828..0c6c3ba5 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -1089,7 +1089,7 @@ void setup()
 	
 #ifndef DEBUG_DISABLE_STARTMSGS
   if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
-		lcd_wizard(0);
+	  lcd_wizard(0);
   }
   else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active
 	  if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED ||
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index bed0da31..01cb739c 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1121,6 +1121,7 @@ void lcd_commands()
 			lcd_setstatuspgm(WELCOME_MSG);
 			lcd_commands_step = 0;
 			lcd_commands_type = 0;
+			menuExiting = true; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by going to status screen
 			if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
 				lcd_wizard(10);
 			}
@@ -3564,7 +3565,9 @@ void lcd_wizard(int state) {
 		case 10: //repeat first layer cal.?
 			wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_REPEAT_V2_CAL, false);
 			if (wizard_event) {
+				//reset status and live adjust z value in eeprom
 				calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST);
+				EEPROM_save_B(EEPROM_BABYSTEP_Z, 0);
 				lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED);
 				state = 9;
 			}