Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rfc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6 -rea5503bb65eb6d19c49815a0f2f8c7c0f972e5c4
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision fc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ea5503bb65eb6d19c49815a0f2f8c7c0f972e5c4)
@@ -149,7 +149,6 @@
     if ( TRUE == areInletWaterConditionsAlarmsActive() )
     {
         setValveState( VSP, VALVE_STATE_CLOSED );
-        setValveState( VPI, VALVE_STATE_CLOSED );
         stopSampleWaterRequest = FALSE;
         standbyState           = DG_STANDBY_MODE_STATE_IDLE;
     }
@@ -202,13 +201,13 @@
         checkInletWaterPressure();
 
         // Check if any of the alarms are active
-        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_DG_RO_REJECTION_RATIO_OUT_OF_RANGE ) )              ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_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_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;