Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r5cfa1f3d17db625f92f046868812717e3f1f51c3
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 5cfa1f3d17db625f92f046868812717e3f1f51c3)
@@ -21,6 +21,7 @@
 #include "OperationModes.h"
 #include "Reservoirs.h"
 #include "Valves.h"
+#include "ConductivitySensors.h"
 
 /**
  *  @addtogroup DGDrainMode
@@ -81,6 +82,10 @@
  *************************************************************************/
 U32 execDrainMode( void )
 {
+
+    // check inlet water conductivity
+    checkInletWaterConductivity( drainState );
+
     // execute current drain state
     switch ( drainState )
     {
@@ -93,7 +98,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, drainState )     // TODO - add s/w fault enum to 1st data param
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, drainState )     // TODO - add s/w fault enum to 1st data param
             drainState = DG_DRAIN_STATE_START;
             break;
     }