Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rc230be1bd4296324bf5dfc288c212eb7c2ce5d2d -rff676a9640e5dfe162de78d2b24f356f63bad5bb
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision c230be1bd4296324bf5dfc288c212eb7c2ce5d2d)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision ff676a9640e5dfe162de78d2b24f356f63bad5bb)
@@ -915,7 +915,7 @@
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevChemDisinfectFlushState )
     }
-    requestNewOperationMode( DG_MODE_FAUL );
+    requestNewOperationMode( DG_MODE_STAN );
 }
 
 /*********************************************************************//**
@@ -1072,7 +1072,12 @@
             {
                 prevChemDisinfectFlushState = chemDisinfectFlushState;
                 chemDisinfectFlushState     = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
-                alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION;
+                alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+
+                if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+                {
+                    alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+                }
             }
         }
     }