Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r39799e6911039979ddec56a4eda7876aa4e0f165 -r46a9148605c584c65aa759d2044d91428fcdd175
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 39799e6911039979ddec56a4eda7876aa4e0f165)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 46a9148605c584c65aa759d2044d91428fcdd175)
@@ -416,6 +416,7 @@
             switch ( getCurrentOperationMode() )
             {
                 case DG_MODE_GENE:
+                case DG_MODE_CHFL:
                     // The flow cannot be out of target by more than +/- 100 mL/min
                     isFlowOutOfRange      = ( ( fabs( currentFlowLPM - targetFlowLPM ) * ML_PER_LITER ) > MAX_ALLOWED_FLOW_DEVIATION_MLPM );
                     isFlowOutOfUpperRange = ( isFlowOutOfRange && ( currentFlowLPM > targetFlowLPM ) ? TRUE : FALSE );
@@ -433,7 +434,6 @@
                 case DG_MODE_FLUS:
                 case DG_MODE_HEAT:
                 case DG_MODE_CHEM:
-                case DG_MODE_CHFL:
                     // The flow cannot be out of range for than 10% of the target flow
                     isFlowOutOfRange      = ( fabs( 1.0F - ( currentFlowLPM / targetFlowLPM ) ) > MAX_ALLOWED_FLOW_DEVIATION_PCT ? TRUE : FALSE );
                     isFlowOutOfUpperRange = ( isFlowOutOfRange && ( currentFlowLPM > targetFlowLPM ) ? TRUE : FALSE );
Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rcd872cad75ebc844eee95f4a14904a269c544bbc -r46a9148605c584c65aa759d2044d91428fcdd175
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision cd872cad75ebc844eee95f4a14904a269c544bbc)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 46a9148605c584c65aa759d2044d91428fcdd175)
@@ -467,6 +467,11 @@
     // Set the chemical disinfect state that is published on the UI
     chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT;
 
+    if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+    {
+        clearAlarm( ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID );
+    }
+
     if ( FALSE == isAlarmActive( ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID ) )
     {
         // Set all the actuators to reset and de-energized state
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -r46a9148605c584c65aa759d2044d91428fcdd175
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 46a9148605c584c65aa759d2044d91428fcdd175)
@@ -363,6 +363,11 @@
 
     chemDisinfectFlushUIState = CHEM_DISINFECT_FLUSH_UI_STATE_FLUSH_AFTER_DISINFECT;
 
+    if ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) )
+    {
+        clearAlarm( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID );
+    }
+
     if ( FALSE == isAlarmActive( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID ) )
     {
         // Close VPi to prevent wasting water