Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r08eb8944c4db804b373cf37a78a761b01f00e649 -rcc52e0daf66905c55ee62a9c6fa88a3c60125e63
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 08eb8944c4db804b373cf37a78a761b01f00e649)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision cc52e0daf66905c55ee62a9c6fa88a3c60125e63)
@@ -317,11 +317,9 @@
 /*********************************************************************//**
  * @brief
  * The checkInletWaterConductivity function checks inlet water conductivity value
- * and triggers an alarm when conductivity value is not within the specified
- * values.
+ * and triggers an alarm when conductivity value is out of allowed range.
  * @details Inputs: CPi sensor conductivity
- * @details Outputs: Trigger warning alarm if conductivity is in the warning
- * range. Trigger alarm if conductivity is below minimum conductivity.
+ * @details Outputs: Trigger alarms when conductivity is out of allowed range
  * @return none
  *************************************************************************/
 void checkInletWaterConductivity( void )
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r5857de39a15c4c373c853e0856a7d7f06665848e -rcc52e0daf66905c55ee62a9c6fa88a3c60125e63
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 5857de39a15c4c373c853e0856a7d7f06665848e)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision cc52e0daf66905c55ee62a9c6fa88a3c60125e63)
@@ -453,65 +453,79 @@
  *************************************************************************/
 void checkInletWaterTemperature( void )
 {
+    F32 temperature = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
+
+    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+    {
+
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
-    {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK ) != TRUE )
         {
-            DG_OP_MODE_T opMode         = getCurrentOperationMode();
-            F32 temperature             = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
-            BOOL isWaterTempInHighRange = ( temperature > MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
-            BOOL isWaterTempInLowRange  = ( temperature < MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ? TRUE : FALSE );
-
-            switch( opMode )
+            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK ) != TRUE )
             {
-                case DG_MODE_GENE:
-                case DG_MODE_FILL:
-                case DG_MODE_DRAI:
-                case DG_MODE_STAN:
-                    if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )
-                    {
-                        isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
-                    }
+                DG_OP_MODE_T opMode         = getCurrentOperationMode();
+                BOOL isWaterTempInHighRange = ( temperature > MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
+                BOOL isWaterTempInLowRange  = ( temperature < MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ? TRUE : FALSE );
 
-                    // Per PRS 406
-                    checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature,
-                                          MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+                switch( opMode )
+                {
+                    case DG_MODE_GENE:
+                    case DG_MODE_FILL:
+                    case DG_MODE_DRAI:
+                    case DG_MODE_STAN:
+                        if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )
+                        {
+                            isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
+                        }
 
-                    if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )
-                    {
-                        isWaterTempInLowRange = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
-                    }
+                        // Per PRS 406
+                        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature,
+                                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
 
-                    // Per PRS 405
-                    checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, isWaterTempInLowRange, temperature,
-                                          MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
-                    break;
+                        if ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )
+                        {
+                            isWaterTempInLowRange = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
+                        }
 
-                case DG_MODE_FLUS:
-                case DG_MODE_HEAT:
-                case DG_MODE_HCOL:
-                case DG_MODE_CHEM:
-                case DG_MODE_CHFL:
-                case DG_MODE_ROPS:
-                    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-                    {
+                        // Per PRS 405
+                        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, isWaterTempInLowRange, temperature,
+                                              MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+                        break;
+
+                    case DG_MODE_FLUS:
+                    case DG_MODE_HEAT:
+                    case DG_MODE_HCOL:
+                    case DG_MODE_CHEM:
+                    case DG_MODE_CHFL:
+                    case DG_MODE_ROPS:
                         isWaterTempInHighRange = ( temperature > MAX_CLEANING_MODE_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
                         // Per PRS 557
                         checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, isWaterTempInHighRange, temperature,
                                               MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
                         checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, isWaterTempInLowRange, temperature,
                                               MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
-                    }
-                    break;
+                        break;
 
-                default:
-                    // NOTE: Do nothing in the rest of the modes
-                    break;
+                    default:
+                        // NOTE: Do nothing in the rest of the modes
+                        break;
+                }
             }
         }
     }
+    else
+    {
+        // VPI is closed - clear all alarms
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, FALSE, temperature,
+                              MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+    }
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r79b494c344417ba6865db01ad5f456e439bec1b2 -rcc52e0daf66905c55ee62a9c6fa88a3c60125e63
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 79b494c344417ba6865db01ad5f456e439bec1b2)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cc52e0daf66905c55ee62a9c6fa88a3c60125e63)
@@ -206,20 +206,17 @@
     // Check inlet water conductivity, temperature, pressure, and RO rejection ratio
     BOOL status = FALSE;
 
-    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-    {
-        checkInletWaterConductivity();
-        checkInletWaterTemperature();
-        checkInletWaterPressure();
+    checkInletWaterConductivity();
+    checkInletWaterTemperature();
+    checkInletWaterPressure();
 
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE );
-        status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE );
-    }
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE );
+    status |= isAlarmConditionActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE );
 
     return status;
 }