Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -rbc79ea1fc44ed327da7efcca54af9db15b8c88cd
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision bc79ea1fc44ed327da7efcca54af9db15b8c88cd)
@@ -202,14 +202,14 @@
         checkInletWaterPressure();
 
         // Check if any of the alarms are active
-        if ( ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )        ||
-             ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )       ||
-             ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )        ||
-             ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )         ||
+        if ( ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )        ||
+             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )       ||
+             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )        ||
+             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )         ||
              ( TRUE == isAlarmActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ) )  ||
-             ( TRUE == isAlarmActive( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE ) )              ||
-             ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )           ||
-             ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
+             ( TRUE == isAlarmActive( ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE ) )              ||
+             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )           ||
+             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
         {
             status = TRUE;
         }