Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r2a03f6c87706478406a4962d70f5bae2ccb57728 -r853ebb4569739cf4d0ea75b7d3c11571f0f3d000
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 2a03f6c87706478406a4962d70f5bae2ccb57728)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 853ebb4569739cf4d0ea75b7d3c11571f0f3d000)
@@ -281,6 +281,12 @@
 
     rinsebackTimerCtr++;
 
+    // Check for user confirmation of end treatment
+    if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) )
+    {
+        endTreatmentRequested = TRUE;
+    }
+
     switch ( rinsebackState )
     {
         case RINSEBACK_STOP_INIT_STATE:
@@ -633,7 +639,9 @@
                 break;
 
             case REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT:
-                accepted = handleEndTreatmentUserAction( &rejReason );
+                // Send message to UI to get user confirmation to end treatment - action initiated only upon receipt of user confirmation from UI
+                addConfirmationRequest( GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0 );
+                accepted = TRUE;
                 break;
 
             case REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT:
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rc1b9ac0dbf2196280895d2e440dd7ac288ac8424 -r853ebb4569739cf4d0ea75b7d3c11571f0f3d000
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision c1b9ac0dbf2196280895d2e440dd7ac288ac8424)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 853ebb4569739cf4d0ea75b7d3c11571f0f3d000)
@@ -186,6 +186,12 @@
 
     txEndTimerCtr++;
 
+    // Check for user confirmation of end treatment
+    if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) )
+    {
+        txEndAlarmEndTreatmentRequested = TRUE;
+    }
+
     switch ( treatmentEndState )
     {
         case TREATMENT_END_WAIT_FOR_RINSEBACK_STATE:
@@ -352,7 +358,8 @@
  *************************************************************************/
 void signalTreatmentEndAlarmEndTxUserAction( void )
 {
-    txEndAlarmEndTreatmentRequested = TRUE;
+    // Send message to UI to get user confirmation to end treatment - action initiated only upon receipt of user confirmation from UI
+    addConfirmationRequest( GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0 );
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -r01588478fb5cb7e78646b3646ba70a40269db20c -r853ebb4569739cf4d0ea75b7d3c11571f0f3d000
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 01588478fb5cb7e78646b3646ba70a40269db20c)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 853ebb4569739cf4d0ea75b7d3c11571f0f3d000)
@@ -188,6 +188,12 @@
     // Count time in this sub-mode
     recircTimerCtr++;
 
+    // Check for user confirmation of end treatment
+    if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) )
+    {
+        recircEndTreatmentRequested = TRUE;
+    }
+
     switch ( treatmentRecircState )
     {
         case TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE:
@@ -369,7 +375,9 @@
                 break;
 
             case REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT:
-                accepted = handleRecircEndTreatmentUserAction( &rejReason );
+                // Send message to UI to get user confirmation to end treatment - action initiated only upon receipt of user confirmation from UI
+                addConfirmationRequest( GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0 );
+                accepted = TRUE;
                 break;
 
             case REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_DISCONNECT: