Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r80108771999ace3313b3f788df487e8e4ee38019 -re7b65409100c66dfe8b1a18b89c5245adb21ce2d
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 80108771999ace3313b3f788df487e8e4ee38019)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision e7b65409100c66dfe8b1a18b89c5245adb21ce2d)
@@ -343,6 +343,9 @@
     // Has user requested rinseback start?
     if ( TRUE == startRinsebackRequested )
     {
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
         if ( isTreatmentCompleted() != TRUE )
         {
             sendTreatmentLogEventData( MID_TREATMENT_RINSE_BACK_EVENT, 0.0, rinsebackRate_mL_min );
@@ -393,13 +396,19 @@
     // Has user requested to end rinseback?
     if ( TRUE == endRinsebackRequested )
     {
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
         setupForRinsebackStopOrPause();
         targetRinsebackVolumePlusAdditional_mL = getRinsebackVolume();
         result = RINSEBACK_STOP_STATE;
     }
     // Has rinseback completed?
     else if ( getRinsebackVolume() >= rinsebackTargetVolume_mL )
     {
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
         setRinsebackIsCompleted( TRUE );
         setupForRinsebackStopOrPause();
         targetRinsebackVolumePlusAdditional_mL = getRinsebackVolume();
@@ -472,6 +481,9 @@
     // Has user requested to end rinseback?
     else if ( TRUE == endRinsebackRequested )
     {
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
+        setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
         targetRinsebackVolumePlusAdditional_mL = getRinsebackVolume();
         result = RINSEBACK_STOP_STATE;
     }
@@ -592,6 +604,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The signalRinsebackAlarmResumeUserAction function signals the rinseback
+ * sub-mode to resume per user alarm action.
+ * @details Inputs: none
+ * @details Outputs: resumeRinsebackRequested
+ * @return none
+ *************************************************************************/
+void signalRinsebackAlarmResumeUserAction( void )
+{
+    resumeRinsebackRequested = TRUE;
+}
+
+/*********************************************************************//**
+ * @brief
  * The signalRinsebackUserAction function signals a rinseback user action
  * has been requested.  The request is handled and responded to.
  * @details Inputs: none