Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r1aeab08c1baf6445514b81fe51fc60a3e536e782 -ra069eb423b26296eb95214e18383c81adae07497
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 1aeab08c1baf6445514b81fe51fc60a3e536e782)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision a069eb423b26296eb95214e18383c81adae07497)
@@ -73,16 +73,17 @@
  * @brief
  * The initDrainMode function initializes the drain mode module.
  * @details Inputs: none
- * @details Outputs: drainState, drainEmptyTareTimerCtr, dialysateDrainStartTime
+ * @details Outputs: drainState, drainEmptyTareTimerCtr, dialysateDrainStartTime,
+ * rinseConcentrateLines, rinseConcentrateLinesTimerCtr
  * @return none
  *************************************************************************/
 void initDrainMode( void )
 {
-    drainState              = DG_DRAIN_STATE_START;
-    drainEmptyTareTimerCtr  = 0;
-    rinseConcentrateLines = FALSE;
+    drainState                    = DG_DRAIN_STATE_START;
+    drainEmptyTareTimerCtr        = 0;
+    rinseConcentrateLines         = FALSE;
     rinseConcentrateLinesTimerCtr = 0;
-    dialysateDrainStartTime = 0;
+    dialysateDrainStartTime       = 0;
 }
 
 /*********************************************************************//**
@@ -115,8 +116,9 @@
     // because the initial guess in the heaters driver needs the target flow to calculate
     // the new PWMs for the main and small primary heaters
 #ifndef DISABLE_FLOW_CONTROL_TREATMENT
-    setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+    setROPumpTargetFlowRateLPM( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
 #endif
+    setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
     startHeater( DG_PRIMARY_HEATER );
 
     return drainState;