Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rf99f8b365af2274d68d7f424cc9be9815b4db19c -rad2492d1c1b63ec2727e5a7a13c5b3a4f8021f86
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision f99f8b365af2274d68d7f424cc9be9815b4db19c)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision ad2492d1c1b63ec2727e5a7a13c5b3a4f8021f86)
@@ -466,7 +466,7 @@
     U32  pendingIndex                    = 0;
     CONFIRMATION_REQUEST_STATUS_T status = CONFIRMATION_REQUEST_STATUS_PENDING;
     U32  i;
-    UI_OFF_BUTTON_PAYLOAD_T cmd;
+    UI_PAYLOAD_T cmd;
     cmd.id = 0;
     cmd.reason = 0;
 
@@ -477,16 +477,17 @@
             status = confirmRequests[ i ].status;
             if ( status != CONFIRMATION_REQUEST_STATUS_PENDING )
             {
+                cmd.id = requestID;
                 // Send UI clear
                 if ( CONFIRMATION_REQUEST_STATUS_TIMEOUT == status )
                 {
                     cmd.command = GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE;
-                    sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_OFF_BUTTON_PAYLOAD_T ) );
+                    sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_PAYLOAD_T ) );
                 }
                 else
                 {
                     cmd.command = GENERIC_CONFIRM_CMD_ACCEPT_CLOSE;
-                    sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_OFF_BUTTON_PAYLOAD_T ) );
+                    sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_PAYLOAD_T ) );
                 }
 
                 // Clear the confirmation request, it is done and consumed
@@ -518,7 +519,7 @@
     {
         // Last confirmation cleared, pending request must be resent to UI
         cmd.command = confirmRequests[ pendingIndex ].requestType;
-        sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_OFF_BUTTON_PAYLOAD_T ) );
+        sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_PAYLOAD_T ) );
     }
 
     return status;
@@ -561,7 +562,7 @@
 {
     U32 i;
     GENERIC_CONFIRM_ID_T newID = GENERIC_CONFIRM_ID_NONE;
-    UI_OFF_BUTTON_PAYLOAD_T cmd;
+    UI_PAYLOAD_T cmd;
 
     // Check whether this confirmation is already pending
     for ( i = 0; i < MAX_PENDING_CONFIRM_REQUESTS; i++ )
@@ -589,7 +590,7 @@
             cmd.command = requestType;
             cmd.reason = rejectReason;
 
-            sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_OFF_BUTTON_PAYLOAD_T ) );
+            sendMessage( MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&cmd, sizeof( UI_PAYLOAD_T ) );
 
             break;
         }
Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -rf99f8b365af2274d68d7f424cc9be9815b4db19c -rad2492d1c1b63ec2727e5a7a13c5b3a4f8021f86
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision f99f8b365af2274d68d7f424cc9be9815b4db19c)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision ad2492d1c1b63ec2727e5a7a13c5b3a4f8021f86)
@@ -57,7 +57,7 @@
     U32 id;
     U32 command;
     U32 reason;
-} UI_OFF_BUTTON_PAYLOAD_T;
+} UI_PAYLOAD_T;
 #pragma pack(pop)
 
 /// Payload record structure for UI response.