Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r4a22fc18a17947587613273eb8cc08fd8c95beb8 -r693f9ed31c3f92b6f71b22ce0ae3a6f29ae92394
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4a22fc18a17947587613273eb8cc08fd8c95beb8)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 693f9ed31c3f92b6f71b22ce0ae3a6f29ae92394)
@@ -108,7 +108,7 @@
     DG_OP_MODE_T dgOpMode = getDGOpMode();  // TODO - the DG mode & sub-mode come as a pair at interval - they MUST be kept together.
     U32 dgSubMode = getDGSubMode();
 
-#ifdef UF_TEST_WITH_DG
+#ifndef RUN_WITHOUT_DG
     // state machine to get DG to prep a reservoir so we can start a treatment
     switch ( currentStandbyState )
     {
@@ -178,21 +178,26 @@
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
-            if ( TRUE == treatStartReqReceived )
-            {
-                requestNewOperationMode( MODE_TPAR );
-                treatStartReqReceived = FALSE;
-            }
             // TODO - test code
             if ( TRUE == stop )
             {
                 if ( DG_MODE_CIRC == dgOpMode )
                 {
                     if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
                     {
+#ifndef DISABLE_UI_TREATMENT_WORKFLOW
+                        if ( TRUE == treatStartReqReceived )
+                        {
+                            setStartReservoirVolume();
+                            cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+                            requestNewOperationMode( MODE_TPAR );
+                            treatStartReqReceived = FALSE;
+                        }
+#else
                         setStartReservoirVolume();
                         cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
                         requestNewOperationMode( MODE_TPAR );
+#endif
                     }
                 }
             }