Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753 -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
@@ -25,10 +25,12 @@
 #include "MessageSupport.h"
 #include "ModeFault.h"
 #include "ModeHeatDisinfect.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
+#include "RTC.h"
 #include "Switches.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -1211,7 +1213,11 @@
             stopHeater( DG_PRIMARY_HEATER );
             stopHeater( DG_TRIMMER_HEATER );
             stateTimer = getMSTimerCount();
-            state = DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS;
+            state      = DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS;
+
+            // Set the disinfect flags
+            setDisinfectStatus( TRUE );
+            setLastDisinfectDate( getRTCTimestamp() );
             break;
 
         case HEAT_DISINFECT_HEAT_UP_IN_PROGRESS: