Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r5aee05d242962c2f9294577c3ba5015f9342fb83 -r2ac3479b027dd1dab8673b9959ab13234a68d842
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 5aee05d242962c2f9294577c3ba5015f9342fb83)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 2ac3479b027dd1dab8673b9959ab13234a68d842)
@@ -927,8 +927,9 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectFillWithWaterState( void )
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER;
-    heatDisinfectUIState            = HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER;
 
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER;
+
     // First reservoir 1 must be full
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {
@@ -1074,8 +1075,9 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectFillR2WithHotWaterState( void )
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER;
-    heatDisinfectUIState            = HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER;
 
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER;
+
     // First reservoir 1 must be partially full
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {
@@ -1127,8 +1129,9 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1;
     HEAT_DISINFECT_STATUS_T status  = getHeatDisinfectStatus();
-    heatDisinfectUIState            = HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2;
 
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2;
+
     if ( TRUE == didTimeout( stateTimer, HEAT_DISINFECT_REF_RSRVR_TIMEOUT_MS ) )
     {
         if ( ( rsrvr1RefVolML < NEARLY_ZERO ) && ( rsrvr2RefVolML < NEARLY_ZERO ) )
@@ -1179,8 +1182,9 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCoolDownHeatersState( void )
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS;
-    heatDisinfectUIState            = HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE;
 
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE;
+
     writeDisinfectDataToNV( USAGE_INFO_HEAT_DIS );
 
     if ( TRUE == didTimeout( stateTimer, POST_HEAT_DISINFECT_WAIT_TIME_MS ) )
@@ -1219,8 +1223,9 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectMixDrainR1State( void )
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1;
-    heatDisinfectUIState            = HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT;
 
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT;
+
     if ( ( TRUE == didTimeout( stateTimer, DRAIN_PUMP_START_TIME_IN_MIX_DRAIN_MS ) ) && ( FALSE == isDrainPumpInMixDrainOn ) )
     {
         isDrainPumpInMixDrainOn = TRUE;
@@ -1441,8 +1446,9 @@
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCompleteState( void )
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_COMPLETE;
-    heatDisinfectUIState            = HEAT_DISINFECT_UI_STATE_COMPLETE;
 
+    heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_COMPLETE;
+
     requestNewOperationMode( DG_MODE_HCOL );
 
     return state;