Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r9abed0946b73f7255b51553d5bbb1008d0e4fde5 -rb98cf2ea978c111513797661dac7c1f9941e92f3
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9abed0946b73f7255b51553d5bbb1008d0e4fde5)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b98cf2ea978c111513797661dac7c1f9941e92f3)
@@ -1765,7 +1765,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 )
@@ -1780,6 +1780,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++ )
             {