Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r1d07de4e970f54f2ae1786ef546cf5567df9ba8e -rb7b4599fe79b345762856e0e3a67b808f55bfacc
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 1d07de4e970f54f2ae1786ef546cf5567df9ba8e)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision b7b4599fe79b345762856e0e3a67b808f55bfacc)
@@ -564,7 +564,7 @@
 {
     DRAIN_STATE_T state = DRAIN_DG_DEPRIME_STATE;
 
-    if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
+    if ( ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) ) || ( DG_MODE_FAUL == getDGOpMode() ) )
     {
         if ( FALSE == drainDGDePrimeActive )
         {
@@ -581,7 +581,14 @@
         {
             drainDGDePrimeActive = FALSE;
             signalDialInPumpHardStop( );
-            state = DRAIN_RESERVOIR_SWITCH_STATE;
+            if ( getDGOpMode() != DG_MODE_FAUL )
+            {
+                state = DRAIN_RESERVOIR_SWITCH_STATE;
+            }
+            else
+            {
+                state = DRAIN_RESERVOIR_COMPLETE_STATE;
+            }
         }
     }