Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r9861a0e5ab609dfd56e6c612e41a91edbfda24af -r5ab03489929d8cc5bbf47d8533d624fd8e4136c3
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 9861a0e5ab609dfd56e6c612e41a91edbfda24af)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 5ab03489929d8cc5bbf47d8533d624fd8e4136c3)
@@ -769,13 +769,13 @@
     if ( CONCENTRATEPUMPS_CP1_ACID == pumpId )
     {
         setFPGAAcidPumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE );
-        concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].controlSet &= ~CONCENTRATE_PUMP_CONTROL_ENABLE_MASK;
+        concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].controlSet |= CONCENTRATE_PUMP_CONTROL_ENABLE_MASK;
         setFPGAAcidPumpControl( concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].controlSet );
     }
     else
     {
         setFPGABicarbSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE );
-        concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].controlSet &= ~CONCENTRATE_PUMP_CONTROL_ENABLE_MASK;
+        concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].controlSet |= CONCENTRATE_PUMP_CONTROL_ENABLE_MASK;
         setFPGABicarbPumpControl( concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].controlSet  );
     }
 
@@ -1312,7 +1312,7 @@
                 //Handle stop command
                 if ( FALSE == payload.startStop )
                 {
-                    requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)payload.pumpID, TRUE );
+                    requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)payload.pumpID, FALSE );
                     result = TRUE;
                 }
             }