Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -ra4669c80291e85fa5ce17d77ebcfd0c882831202 -r656f3ada9ab5dff1d6c377d237e799f3ab5ba7c3
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision a4669c80291e85fa5ce17d77ebcfd0c882831202)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 656f3ada9ab5dff1d6c377d237e799f3ab5ba7c3)
@@ -465,6 +465,7 @@
 
         // Close VPi to prevent wasting water
         setValveState( VPI, VALVE_STATE_CLOSED );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
 
         // Set the actuators to drain R1
         setValveState( VRD1, VALVE_STATE_OPEN );
@@ -508,7 +509,6 @@
             setValveState( VPI, VALVE_STATE_OPEN );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setValveState( VRD1, VALVE_STATE_CLOSED );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
 
@@ -537,6 +537,8 @@
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R2;
         }
 
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
+
         // Start the timer
         stateTimer = getMSTimerCount();
     }
@@ -591,6 +593,7 @@
             stateTimer = getMSTimerCount();
             state = DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN;
         }
+        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
@@ -1584,7 +1587,7 @@
             // De-energize all the valves and set the VDr to drain R2
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+            setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_OPEN );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );