Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753 -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
@@ -24,10 +24,12 @@
 #include "ModeChemicalDisinfect.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
+#include "RTC.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 #include "TemperatureSensors.h"
@@ -1293,7 +1295,11 @@
             // Turn off the heaters
             stopHeater( DG_PRIMARY_HEATER );
             stateTimer = getMSTimerCount();
-            state = DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS;
+            state      = DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS;
+
+            // Set the disinfect flags
+            setDisinfectStatus( TRUE );
+            setLastDisinfectDate( getRTCTimestamp() );
             break;
     }