Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753 -rab14e70c7bac24b0c3ebd02c6763285cdd3951ce
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ab14e70c7bac24b0c3ebd02c6763285cdd3951ce)
@@ -410,17 +410,22 @@
         cmdResponse.commandID  = DG_CMD_START_FLUSH;
         cmdResponse.rejected   = FALSE;
         cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
+        OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP );
+        OPN_CLS_STATE_T diaCap  = getSwitchStatus( DIALYSATE_CAP );
 
-        if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
-        {
 #ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+        {
+            concCap = STATE_CLOSED;
+            diaCap  = STATE_CLOSED;
+        }
 #endif
-            {
-                cmdResponse.rejected   = TRUE;
-                cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
-                                                                                            REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
-            }
+
+        if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) )
+        {
+            cmdResponse.rejected   = TRUE;
+            cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
+                                                                                        REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
         else
         {
@@ -450,20 +455,25 @@
     {
         DG_CMD_RESPONSE_T cmdResponse;
 
-        cmdResponse.commandID  = DG_CMD_START_HEAT_DISINFECT;
-        cmdResponse.rejected   = FALSE;
-        cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
+        cmdResponse.commandID   = DG_CMD_START_HEAT_DISINFECT;
+        cmdResponse.rejected    = FALSE;
+        cmdResponse.rejectCode  = DG_CMD_REQUEST_REJECT_REASON_NONE;
+        OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP );
+        OPN_CLS_STATE_T diaCap  = getSwitchStatus( DIALYSATE_CAP );
 
-        if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
-        {
 #ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+        {
+            concCap = STATE_CLOSED;
+            diaCap  = STATE_CLOSED;
+        }
 #endif
-            {
-                cmdResponse.rejected   = TRUE;
-                cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
-                                                                                            REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
-            }
+
+        if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) )
+        {
+            cmdResponse.rejected   = TRUE;
+            cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
+                                                                                        REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
         else
         {
@@ -492,27 +502,30 @@
     // Chemical disinfect cannot be run in solo mode because the user has to confirm that the acid is inserted or removed
     if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
     {
-#ifndef DISABLE_CAP_SWITCHES
         DG_CMD_RESPONSE_T cmdResponse;
 
         cmdResponse.commandID  = DG_CMD_START_CHEM_DISINFECT;
         cmdResponse.rejected   = FALSE;
         cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
+        OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP );
+        OPN_CLS_STATE_T diaCap  = getSwitchStatus( DIALYSATE_CAP );
 
-        // When chemical disinfect is about to be started, both caps must be closed
-        if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) || ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
-        {
 #ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) )
+        {
+            concCap = STATE_CLOSED;
+            diaCap  = STATE_CLOSED;
+        }
 #endif
-            {
-                cmdResponse.rejected   = TRUE;
-                cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
-                                                                                            REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
-            }
+
+        // When chemical disinfect is about to be started, both caps must be closed
+        if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) )
+        {
+            cmdResponse.rejected   = TRUE;
+            cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
+                                                                                        REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
        }
         else
-#endif
         {
             pendingStartDGChemicalDisinfectRequest = TRUE;
             status                                 = TRUE;