Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r66c2bc659521bf40c65281cdd49815b8a8dc1156 -r6042952abe8c5b39b4d64c3f13f832713bcfb79a
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 66c2bc659521bf40c65281cdd49815b8a8dc1156)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6042952abe8c5b39b4d64c3f13f832713bcfb79a)
@@ -492,7 +492,7 @@
          ( STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE == currentStandbyState ) ||
          ( STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE == currentStandbyState ) )
     {
-        if ( ( TRUE == stop ) && ( disinfectCancelReqID == GENERIC_CONFIRM_ID_NONE ) )
+        if ( ( TRUE == stop ) && ( GENERIC_CONFIRM_ID_NONE == disinfectCancelReqID ) )
         {
             if ( STANDBY_DG_FLUSH_IN_PROGRESS_STATE == currentStandbyState )
             {
@@ -534,7 +534,8 @@
                             break;
 
                         default:
-                            // TODO should not be here alarm
+                            // Close the UI Confirm
+                            sendConfirmationRequest( disinfectCancelReqID, GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE, 0 );
                             break;
                     }
                     break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r66c2bc659521bf40c65281cdd49815b8a8dc1156 -r6042952abe8c5b39b4d64c3f13f832713bcfb79a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 66c2bc659521bf40c65281cdd49815b8a8dc1156)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6042952abe8c5b39b4d64c3f13f832713bcfb79a)
@@ -7343,35 +7343,37 @@
 void handleUIConfirmationResponse( MESSAGE_T *message )
 {
     BOOL result = FALSE;
+    U08* payloadPtr = message->payload;
 
     if ( message->hdr.payloadLen == 2 * sizeof(U32) )
     {
         U32 request_id;
         CONFIRMATION_REQUEST_STATUS_T status;
         U08 i;
 
-        memcpy( &request_id, message->payload, sizeof(U32) );
-        memcpy( &status, ( message->payload + sizeof(U32) ), sizeof(U32) );
+        memcpy( &request_id, payloadPtr, sizeof(U32) );
+        payloadPtr += sizeof(U32);
+        memcpy( &status, payloadPtr, sizeof(U32) );
 
-        for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
+        if ( ( CONFIRMATION_REQUEST_STATUS_REJECTED == status ) ||
+             ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == status ) )
         {
-            if ( confirmRequests[ i ].requestID == request_id )
+            for ( i = 0; i < NUM_CONFIRM_REQUESTS; i++ )
             {
-                if ( ( CONFIRMATION_REQUEST_STATUS_REJECTED == status ) ||
-                     ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == status ) )
+                if ( confirmRequests[ i ].requestID == request_id )
                 {
                     confirmRequests[ i ].status = status;
+                    break;
                 }
-                else
-                {
-                    // illegal response
-                    // TODO set alarm?
-                }
             }
         }
+        else
+        {
+            // illegal response param
+            // TODO set alarm?  No Ack?
+        }
     }
 
-    // TODO is ACK needed?
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
 }
 
@@ -7388,7 +7390,7 @@
     U08 i;
     CONFIRMATION_REQUEST_STATUS_T status = CONFIRMATION_REQUEST_STATUS_PENDING;
 
-    for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
+    for ( i = 0; i < NUM_CONFIRM_REQUESTS; i++ )
     {
         if ( confirmRequests[ i ].requestID == request_id )
         {
@@ -7408,6 +7410,7 @@
                 confirmRequests[ i ].timeStamp = 0;
                 confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_UNUSED;
             }
+            break;
         }
     }
 
@@ -7430,7 +7433,7 @@
     GENERIC_CONFIRM_ID_T new_id = GENERIC_CONFIRM_ID_NONE;
     U32 temp_request;
 
-    for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
+    for ( i = 0; i < NUM_CONFIRM_REQUESTS; i++ )
     {
         if ( confirmRequests[ i ].status == CONFIRMATION_REQUEST_STATUS_UNUSED )
         {