Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rdd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37 -r66545e508ebd4a541d780737cb65b12c23089dc5
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision dd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 66545e508ebd4a541d780737cb65b12c23089dc5)
@@ -1733,7 +1733,7 @@
  * the correct 32-bit key.  A Dialin user must also be logged into HD.
  * @details Inputs: none
  * @details Outputs: alarmIsActive[], alarmStartedAt[]
- * @param key 32-bit supervior alarm key required to perform this function
+ * @param key 32-bit supervisor alarm key required to perform this function
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testClearAllAlarms( U32 key )
@@ -1748,6 +1748,10 @@
         {
             ALARM_ID_T a;
 
+            // clear the flags when Dialin clears alarms
+            alarmNoRetrigger             = FALSE;
+            resumeBlockedByAlarmProperty = FALSE;
+
             // Clear all active alarms
             for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
             {