Index: firmware/App/Modes/ModeGenPermeate.c
===================================================================
diff -u -rf4870116c87345ee0ea062df5b30187e1e113ddc -r311c75cc5ac41b4b9ca4983df84e43af910f9be4
--- firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision f4870116c87345ee0ea062df5b30187e1e113ddc)
+++ firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 311c75cc5ac41b4b9ca4983df84e43af910f9be4)
@@ -96,6 +96,18 @@
     initGenPermeateMode();
     setCurrentSubState( genPermeateState );
     setModeGenPTransition( genPermeateState );
+
+    // Setting RO pump pwm at the start instead of
+    // each transition to allow testing of different target control
+    // while in Gen Permeate
+    if ( 0.0F == getGenPermeateRODutyCycle() ) // we skipped verify water via dialin
+    {
+        setROPumpTargetDutyCycle( GEN_PERMEATE_PWM_DEFAULT );
+    }
+    else
+    {
+        setROPumpTargetDutyCycle( getGenPermeateRODutyCycle() );
+    }
     return genPermeateState;
 }
 
@@ -162,19 +174,10 @@
             setValveState( P34_VALV, VALVE_STATE_CLOSED ); // Current set to Medium recovery for alpha HW
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV,VALVE_STATE_OPEN );
-
             if ( TRUE == isBoostPumpInstalled() )
             {
                 setBoostPumpTargetPressure( GEN_PERMEATE_BOOST_PUMP_TGT_PSI );
             }
-            if ( 0.0F == getGenPermeateRODutyCycle() ) // we skipped verify water via dialin
-            {
-                setROPumpTargetDutyCycle( GEN_PERMEATE_PWM_DEFAULT );
-            }
-            else
-            {
-                setROPumpTargetDutyCycle( getGenPermeateRODutyCycle() );
-            }
             break;
 
         case FP_GENP_TANK_FULL_STATE:
@@ -193,14 +196,6 @@
             }
             tankFullDelayTime = getMSTimerCount();
             tankFullAlarmTimeout = getMSTimerCount();
-            if ( 0.0F == getGenPermeateRODutyCycle() ) // we skipped verify water via dialin
-            {
-                setROPumpTargetDutyCycle( GEN_PERMEATE_PWM_DEFAULT );
-            }
-            else
-            {
-                setROPumpTargetDutyCycle( getGenPermeateRODutyCycle() );
-            }
             break;
 
         default: