Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -r2b47dd2e7974618d8899527cdbff80fa93ebc9fa
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 96b5f969bbba7b44593c85c8ac003be0a2d87151)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 2b47dd2e7974618d8899527cdbff80fa93ebc9fa)
@@ -8,7 +8,7 @@
 * @file    DrainPump.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      15-Feb-2023
+* @date    (last)      06-Mar-2023
 *
 * @author  (original)  Sean
 * @date    (original)  08-Apr-2020
@@ -665,7 +665,7 @@
         F32 drainPumpOutletPressurePSI = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_OUTLET );
         F32 roPumpOutletPressurePSI    = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET );
         F32 targetROFlowLPM            = getDrainPumpTargetOutletFlowLPM();
-        F32 msrdROFlowLPM              = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
+        F32 msrdROFlowLPM              = getMeasuredROFlowRateWithConcPumpsLPM();
         F32 flowSubLPM                 = msrdROFlowLPM - targetROFlowLPM;
 
         if ( TRUE == isDrainPumpControlInFlowMode )
@@ -944,17 +944,13 @@
 {
     BOOL status = FALSE;
 
-    // Check if the requested drain pump RPM is within range
-    if ( ( value >= MIN_DRAIN_PUMP_RPM ) && ( value <= MAX_DRAIN_PUMP_RPM ) )
+    // Check if the user is logged in
+    if ( TRUE == isTestingActivated() )
     {
-        // Check if the user is logged in
-        if ( TRUE == isTestingActivated() )
-        {
-            drainPumpMeasuredRPM.ovData     = value;
-            drainPumpMeasuredRPM.override   = OVERRIDE_KEY;
-            drainPumpMeasuredRPM.ovInitData = drainPumpMeasuredRPM.data;
-            status                          = TRUE;
-        }
+        drainPumpMeasuredRPM.ovData     = value;
+        drainPumpMeasuredRPM.override   = OVERRIDE_KEY;
+        drainPumpMeasuredRPM.ovInitData = drainPumpMeasuredRPM.data;
+        status                          = TRUE;
     }
 
     return status;