Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r4722a79a0eee50844852c3e47830f9d561bef135
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 4722a79a0eee50844852c3e47830f9d561bef135)
@@ -231,7 +231,17 @@
 
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_AC_POWER_LOST, hasPowerBeenLost ) )
     {
-        activateAlarmNoData( ALARM_ID_HD_AC_POWER_LOST );
+        HD_OP_MODE_T opMode = getCurrentOperationMode();
+
+        // Pre-Treatment, Treatment, or Post-Treatment mode
+        if ( ( MODE_PRET == opMode ) || ( MODE_TREA == opMode ) || ( MODE_POST == opMode ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT, getMonitoredLineLevel( MONITORED_LINE_24V ), getMonitoredLineLevel( MONITORED_LINE_24V_REGEN ) );
+        }
+        else
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_AC_POWER_LOST, getMonitoredLineLevel( MONITORED_LINE_24V ), getMonitoredLineLevel( MONITORED_LINE_24V_REGEN ) )
+        }
     }
 }