Index: firmware/App/Controllers/SubstitutionPump.c
===================================================================
diff -u -r3cad7f9a8cf615b96038e08f0c271aafba5fccbc -r4ae9dd8065549025f92619a9279b0724548a2347
--- firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision 3cad7f9a8cf615b96038e08f0c271aafba5fccbc)
+++ firmware/App/Controllers/SubstitutionPump.c	(.../SubstitutionPump.c)	(revision 4ae9dd8065549025f92619a9279b0724548a2347)
@@ -87,7 +87,7 @@
 #define DRV8434S_CTRL5_DEFAULT                               0x08                                                 ///< Stall detection off by default, but if turned on it will show up as a fault
 #define DRV8434S_CTRL6_DEFAULT                               0x03                                                 ///< Stall detection sensitivity threshold (low byte).
 #define DRV8434S_CTRL7_DEFAULT                               0x20                                                 ///< Low current ripple setting, spread-spectrum switching enabled (reduces EMI noise).
-#define DRV8434S_CTRL_DEFAULT                                0x7F                                                 ///< Stop State indicator flag.
+#define DRV8434S_CTRL_DEFAULT                                0x28                                                 ///< Stop State indicator flag.
 
 /// Enumeration of Substitution pump states.
 typedef enum SubstituionPumpState
@@ -158,6 +158,8 @@
         substitutionPumps[ pumpId ].direction                        = SUBSTITUTION_PUMP_FORWARD_DIR;
         substitutionPumps[ pumpId ].controlSet                       = SUBSTITUTION_PUMP_CONTROL_FORWARD_DIR;
     }
+
+    checkSubstitutionPumpControl();
     setFPGAD92PumpRevolutionCount( SUBSTITUTION_PUMP_ZERO_FLOW_RATE );
     setFPGAD92PumpControl( SUBSTITUTION_PUMP_CONTROL_STOP );
 
@@ -168,7 +170,6 @@
     substitutionPumpDataPublishInterval.override     = OVERRIDE_RESET;
     Enable_DRV8434S_Stepper_Driver                   = FALSE;
 
-    checkSubstitutionPumpControl();
     initPersistentAlarm( ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE, RPM_OUT_OF_RANGE_TIME_OUT, RPM_OUT_OF_RANGE_TIME_OUT );
 }
 
@@ -553,21 +554,21 @@
         if( Enable_DRV8434S_Stepper_Driver == FALSE )
         {
             SUBSTITUTION_PUMP_CONTROL_FORWARD = SUBSTITUTION_PUMP_CONTROL_DRV_ENABLE |
-                                                        SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
-                                                        SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
+                                                SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
+                                                SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
 
-                    SUBSTITUTION_PUMP_CONTROL_STOP    = SUBSTITUTION_PUMP_CONTROL_DRV_DISABLE |
-                                                        SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
-                                                        SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
+            SUBSTITUTION_PUMP_CONTROL_STOP    = SUBSTITUTION_PUMP_CONTROL_DRV_DISABLE |
+                                                SUBSTITUTION_PUMP_CONTROL_DRV_REVERSE_DIR |
+                                                SUBSTITUTION_PUMP_CONTROL_DRV_SIXTY_FOUR_STEP;
 
-                    setFPGAD92CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
-                    setFPGAD92CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
-                    setFPGAD92CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
-                    setFPGAD92CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
-                    setFPGAD92CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
-                    setFPGAD92CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
+            setFPGAD92CTRL1Reg( DRV8434S_CTRL1_DEFAULT );
+            setFPGAD92CTRL2Reg( DRV8434S_CTRL2_DEFAULT );
+            setFPGAD92CTRL4Reg( DRV8434S_CTRL4_DEFAULT );
+            setFPGAD92CTRL5Reg( DRV8434S_CTRL5_DEFAULT );
+            setFPGAD92CTRL6Reg( DRV8434S_CTRL6_DEFAULT );
+            setFPGAD92CTRL7Reg( DRV8434S_CTRL7_DEFAULT );
 
-                    Enable_DRV8434S_Stepper_Driver= TRUE;
+            Enable_DRV8434S_Stepper_Driver= TRUE;
         }
     }
     else