diff --git a/csharp/App/Backend/Websockets/RabbitMQManager.cs b/csharp/App/Backend/Websockets/RabbitMQManager.cs
index 8d8ee4194..c0cdbe308 100644
--- a/csharp/App/Backend/Websockets/RabbitMQManager.cs
+++ b/csharp/App/Backend/Websockets/RabbitMQManager.cs
@@ -125,11 +125,11 @@ public static class RabbitMqManager
                                 Console.WriteLine("Add an alarm for installation "+installationId);
                                 
                                 // Send replace battery email to support team if this alarm is "NeedToReplaceBattery"
-                                if (alarm.Description == "NeedToReplaceBattery" || alarm.Description == "2 or more string are disabled")
+                                if (alarm.Description == "2 or more string are disabled")
                                 {
                                     Console.WriteLine("Send replace battery email to the support team for installation "+installationId);
                                     string recipient = "support@innov.energy";
-                                    string subject = "Battery Alarm: 2 or more strings broken";
+                                    string subject = $"Battery Alarm from {installation.InstallationName}: 2 or more strings broken";
                                     string text = $"Dear InnovEnergy Support Team,\n" +
                                                   $"\n"+
                                                   $"Installation Name: {installation.InstallationName}\n"+