Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -rc54e9565dd57de961ab6533b0af803df698f7a1d
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 5109bb981cab2025fcb9de33e303d046085efa18)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c54e9565dd57de961ab6533b0af803df698f7a1d)
@@ -469,17 +469,24 @@
 
     if ( FALSE == isAlarmActive( ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID ) )
     {
-        // Set all the actuators to reset and de-energized state
-        deenergizeActuators( NO_PARK_CONC_PUMPS );
-        setValveState( VPI, VALVE_STATE_CLOSED );
-        setValveState( VRD1, VALVE_STATE_OPEN );
-        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
-        setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
+        if ( ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
+        {
+            activateAlarmNoData( ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID );
+        }
+        else
+        {
+            // Set all the actuators to reset and de-energized state
+            deenergizeActuators( NO_PARK_CONC_PUMPS );
+            setValveState( VPI, VALVE_STATE_CLOSED );
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
+            setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
-        // Assume reservoir 1 is full and drain it
-        rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
-        state        = DG_CHEM_DISINFECT_STATE_DRAIN_R1;
-        stateTimer   = getMSTimerCount();
+            // Assume reservoir 1 is full and drain it
+            rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
+            state        = DG_CHEM_DISINFECT_STATE_DRAIN_R1;
+            stateTimer   = getMSTimerCount();
+        }
     }
 
     return state;
@@ -1096,8 +1103,9 @@
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD1, VALVE_STATE_CLOSED );
             setValveState( VRD2, VALVE_STATE_OPEN );
-            stateTimer = getMSTimerCount();
-            state      = DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2;
+            stateTimer   = getMSTimerCount();
+            rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
+            state        = DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2;
         }
     }
     else
@@ -1672,13 +1680,22 @@
     if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE ) && ( NELSON_NONE == nelsonSupport ) )
 #endif
     {
-        // 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 ) )
+        // If the concentrate 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 concentrate port and hit ok
+        if ( ( ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) ) ) &&
+             ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
         {
             prevChemDisinfectState      = chemDisinfectState;
             chemDisinfectState          = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+
+            if ( STATE_CLOSED == getSwitchStatus( CONCENTRATE_CAP ) )
+            {
+                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+            }
+            if ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) )
+            {
+                alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+            }
         }
     }