Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rcc067242d41776eb2a598212413e25df5a58b1fe -r22dc8daefbb24bd2a2ea6f0a2465c6714267638c
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cc067242d41776eb2a598212413e25df5a58b1fe)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 22dc8daefbb24bd2a2ea6f0a2465c6714267638c)
@@ -372,7 +372,7 @@
  *************************************************************************/
 BOOL signalUserInitiateFlushMode( void )
 {
-    BOOL result = FALSE;
+    BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
 
     if ( MODE_STAN == getCurrentOperationMode() )
@@ -382,9 +382,9 @@
             if ( TRUE == isDGCommunicating() )
             {
                 flushStartReqReceived = TRUE;
-                result = TRUE;
-                currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
-                rejReason = REQUEST_REJECT_REASON_NONE;
+                result                = TRUE;
+                currentStandbyState   = STANDBY_WAIT_FOR_DISINFECT_STATE;
+                rejReason             = REQUEST_REJECT_REASON_NONE;
             }
             else
             {
@@ -408,7 +408,7 @@
  *************************************************************************/
 BOOL signalUserInitiateHeatDisinfectMode( void )
 {
-    BOOL result = FALSE;
+    BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
 
     if ( MODE_STAN == getCurrentOperationMode() )
@@ -418,9 +418,9 @@
             if ( TRUE == isDGCommunicating() )
             {
                 heatDisinfectStartReqReceived = TRUE;
-                result = TRUE;
-                currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
-                rejReason = REQUEST_REJECT_REASON_NONE;
+                result                        = TRUE;
+                currentStandbyState           = STANDBY_WAIT_FOR_DISINFECT_STATE;
+                rejReason                     = REQUEST_REJECT_REASON_NONE;
             }
             else
             {
@@ -444,7 +444,7 @@
  *************************************************************************/
 BOOL signalUserInitiateChemicalDisinfectMode( void )
 {
-    BOOL result = FALSE;
+    BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
 
     if ( MODE_STAN == getCurrentOperationMode() )
@@ -454,18 +454,19 @@
             if ( TRUE == isDGCommunicating() )
             {
                 chemDisinfectStartReqReceived = TRUE;
-                result = TRUE;
-                currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
-                rejReason = REQUEST_REJECT_REASON_NONE;
+                result                        = TRUE;
+                currentStandbyState           = STANDBY_WAIT_FOR_DISINFECT_STATE;
+                rejReason                     = REQUEST_REJECT_REASON_NONE;
             }
             else
             {
                 rejReason = REQUEST_REJECT_REASON_DG_COMM_LOST;
-                sendDisinfectConfirmResponse( result, rejReason );
             }
         }
     }
 
+    sendDisinfectConfirmResponse( result, rejReason );
+
     return result;
 }
 
@@ -479,16 +480,16 @@
  *************************************************************************/
 BOOL signalInitiateStandbyDisinfectSubmode( void )
 {
-    BOOL result = FALSE;
+    BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
 
     if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
     {
         if ( TRUE == isDGCommunicating() )
         {
             currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
-            result = TRUE;
-            rejReason = REQUEST_REJECT_REASON_NONE;
+            result              = TRUE;
+            rejReason           = REQUEST_REJECT_REASON_NONE;
         }
         else
         {