Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -re258c4013bdffbf4f9e77ab9ef35fd67e3d1bb8f
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e258c4013bdffbf4f9e77ab9ef35fd67e3d1bb8f)
@@ -1669,8 +1669,9 @@
     if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE ) && ( NELSON_NONE == nelsonSupport ) )
 #endif
     {
-        // If the dialysate cap is open during any state, alarm
-        if ( ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
+        // If the dialysate cap is closed during any state other the start state, alarm. In start state we are still looking for
+        // the user to insert the acid into the dialysate port and hit ok
+        if ( ( STATE_CLOSED == getSwitchStatus( DIALYSATE_CAP ) ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
         {
             prevChemDisinfectState      = chemDisinfectState;
             chemDisinfectState          = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -re258c4013bdffbf4f9e77ab9ef35fd67e3d1bb8f
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision e258c4013bdffbf4f9e77ab9ef35fd67e3d1bb8f)
@@ -70,7 +70,7 @@
 #define RSRVRS_DRAIN_TARGET_VOLUME_ML               200.0F                                                     ///< While filling and draining at the same time, look for a volume that indicates draining is working, ml.
 #define FLUSH_ADDITIONAL_TIME_MS                    ( 38 * MS_PER_SECOND )                                     ///< Additional time to flush after reservoir full
 #define NUM_OF_RINSE_CYCLES                         2                                                          ///< Number of rinse cycles
-#define CHEM_DISINFECT_FLUSH_TIME_MS                ( 12 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Chemical disinfect flush time in ms. TODO: get the correct time for the mode or not used?
+#define CHEM_DISINFECT_FLUSH_TIME_MS                ( 12 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Chemical disinfect flush time in ms.
 
 // Fill reservoirs to full defines
 #define RESERVOIR_FULL_VOLUME_CHANGE_LIMIT_ML       5.0F                                                       ///< The maximum difference between the short-term and long-term filtered reservoir volumes in ml that determines the reservoir is full.