Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -re8ca208215236d28f5db7c2deb5500facb0cc481
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision e8ca208215236d28f5db7c2deb5500facb0cc481)
@@ -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 ( opMode == MODE_PRET || opMode == MODE_TREA || opMode == MODE_POST )
+        {
+            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 ) );
+        }
     }
 }
 
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r11b0015549d4371fa2ad4314c17567712a36a564 -re8ca208215236d28f5db7c2deb5500facb0cc481
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 11b0015549d4371fa2ad4314c17567712a36a564)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision e8ca208215236d28f5db7c2deb5500facb0cc481)
@@ -622,7 +622,7 @@
                 if ( 0 == ( BatteryStatusData.BatteryChargerStatus & BATTERY_CHARGER_STATUS_AC_PRESENT_MASK ) )
                 {
                     // Pre-Treatment, Treatment, or Post-Treatment mode
-                    if( opMode == MODE_PRET || opMode == MODE_TREA || opMode == MODE_POST )
+                    if ( opMode == MODE_PRET || opMode == MODE_TREA || opMode == MODE_POST )
                     {
                         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT, BatteryStatusData.BatteryChargerStatus );
                     }