Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rd3926e5817813a9588b77f6c382940176a5feedc -rc3dad292358c336c5b37716292f84d79b9881e2f
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision d3926e5817813a9588b77f6c382940176a5feedc)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision c3dad292358c336c5b37716292f84d79b9881e2f)
@@ -593,7 +593,7 @@
 
         // If the inlet temperature and conductivity are in range, move onto the next state
         if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) >= MIN_INLET_TEMPERATURE_C ) &&
-             ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
+             ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <= MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
             hasConductivityPassed = TRUE;
         }
@@ -622,7 +622,7 @@
         // Couldn't get a good water sample after a couple of trials and the disinfect cycle failed
         else
         {
-            alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_OR_TEMP_OUT;
             prevHeatDisinfectState = state;
             state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
         }