Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r1d07de4e970f54f2ae1786ef546cf5567df9ba8e -r8e9aa2234cc1318c6465480785a0e4af75e7be48
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 1d07de4e970f54f2ae1786ef546cf5567df9ba8e)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8e9aa2234cc1318c6465480785a0e4af75e7be48)
@@ -491,7 +491,7 @@
 void signalAlarmUserActionInitiated( ALARM_USER_ACTION_T action )
 {
     // Validate given action
-    if ( action < NUMBER_OF_ALARM_USER_ACTIONS )
+    if ( ( action < NUMBER_OF_ALARM_USER_ACTIONS ) && ( action != ALARM_USER_ACTION_END_TREATMENT ) )  // end tx action must be confirmed first
     {
         ALARM_ID_T a = alarmStatus.alarmTop;
 
@@ -841,6 +841,7 @@
     // Check for user confirmation of end treatment alarm response
     if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) )
     {
+        clearAllRecoverableAlarms();
         initiateAlarmAction( ALARM_ACTION_END_TREATMENT );
     }