Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rdf41331377d5da437e853327019c17c58e3af775 -r9eb331054aa9406aae1a1c3ba4868b9431a435d5
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision df41331377d5da437e853327019c17c58e3af775)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9eb331054aa9406aae1a1c3ba4868b9431a435d5)
@@ -882,14 +882,26 @@
             if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] )
             {
                 noResume = ( TRUE == ALARM_TABLE[ a ].alarmNoResume ? TRUE : noResume );
+            }
+            else
+            {
+                noResume = TRUE;
             }
             if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RINSEBACK ] )
             {
                 noRinseback = ( TRUE == ALARM_TABLE[ a ].alarmNoRinseback ? TRUE : noRinseback );
+            }
+            else
+            {
+                noRinseback = TRUE;
             }
             if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_END_TREATMENT ] )
             {
                 noEndTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoEndTreatment ? TRUE : noEndTreatment );
+            }
+            else
+            {
+                noEndTreatment = TRUE;
             }
         } // if alarm active
     } // alarm table loop
@@ -935,7 +947,7 @@
 {
     ALARM_ID_T a = alarmStatus.alarmTop;
 
-    for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
+    for ( a = ALARM_ID_HD_SOFTWARE_FAULT; a < NUM_OF_ALARM_IDS; a++ )
     {
         // is alarm recoverable?
         if ( FALSE == ALARM_TABLE[ a ].alarmNoClear )