Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rd80c4a21ab700d8197e292f34c86dad61828c45a -r50fc6ca962c381ac98c9f032115973a5fff2a761
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision d80c4a21ab700d8197e292f34c86dad61828c45a)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 50fc6ca962c381ac98c9f032115973a5fff2a761)
@@ -121,7 +121,6 @@
 void transitionToPostTreatmentMode( void )
 {
     initPostTreatmentMode();
-    SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_MODE_CHANGE, 0, HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE )
 
     // Stop any DG fill that may be in progress from an aborted treatment
     cmdStopDGFill();
@@ -533,12 +532,12 @@
 
     if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
-        cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+        cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
 
         if ( TRUE == hasDGCompletedReservoirSwitch() )
         {
             state = DRAIN_FIRST_RESERVOIR_STATE;
-            rinseConcentrateLines = FALSE;
+            rinseConcentrateLines = TRUE;
             cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, rinseConcentrateLines );
         }
     }
@@ -598,7 +597,7 @@
     if ( TRUE == hasDGCompletedReservoirSwitch() )
     {
         state = DRAIN_SECOND_RESERVOIR_STATE;
-        rinseConcentrateLines = TRUE;
+        rinseConcentrateLines = FALSE;
         cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, rinseConcentrateLines );
     }