Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r8a4182663ef6b12e3fd6414c0c14158943cd4ce1 -r3f7d30b23906496854054949d4491f3bae6ef3c4
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 8a4182663ef6b12e3fd6414c0c14158943cd4ce1)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 3f7d30b23906496854054949d4491f3bae6ef3c4)
@@ -2014,15 +2014,16 @@
         if ( ( DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 == chemDisinfectState ) ||
              ( DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 == chemDisinfectState ) )
         {
+            uiData.chemDisinfectTargetTime  = CHEM_DISINFECT_TIME_MS;
             uiData.chemDisinfectElapsedTime = calcTimeSince( chemDisinfectTimer );
-            data.R1FillLevel              = R1ChemDisinfectVol;
-            data.R2FillLevel              = R2ChemDisinfectVol;
+            data.R1FillLevel                = R1ChemDisinfectVol;
+            data.R2FillLevel                = R2ChemDisinfectVol;
         }
         else
         {
             uiData.chemDisinfectElapsedTime = 0.0;
-            data.R1FillLevel              = 0.0;
-            data.R2FillLevel              = 0.0;
+            data.R1FillLevel                = 0.0;
+            data.R2FillLevel                = 0.0;
         }
 
         data.postDisinfectTargetRinseCount  = NUM_OF_POST_DISINFECT_RINSES;