Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -r52d17dab2211c2e4d9160c55c316ad7a40ce4d6c -re50998d376110516b4d3c9c860b9cbb4f2013623
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision 52d17dab2211c2e4d9160c55c316ad7a40ce4d6c)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision e50998d376110516b4d3c9c860b9cbb4f2013623)
@@ -111,7 +111,6 @@
             break
         case PreTreatmentStack.Step.CreateRx:
             _pretreatmentCreate.confirmButtonClicked()
-            if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentConnect ) }
             break
         case PreTreatmentStack.Step.Connect:
             vPreTreatmentAdjustmentStartTreatment.doStart()
@@ -146,8 +145,7 @@
             return _pretreatmentInstallation.confirmButtonText()
         case PreTreatmentStack.Step.CreateRx:
             return _pretreatmentCreate.isFirstTab ? qsTr("Next") :
-                                                    vTreatmentCreate.parametersValidated ?  qsTr("Confirm") :
-                                                                                            qsTr("Validate")
+                                                    qsTr("Validate")
         case PreTreatmentStack.Step.Connect:
             return qsTr("Start")
         default:
@@ -271,6 +269,13 @@
         }
     }
 
+    // creat rx
+    Connections{ target: vTreatmentCreate
+        function onDidValidationPass            ( ) {
+            page ( _pretreatmentConnect )
+        }
+    }
+
     // start treatment
     Connections { target: vPreTreatmentAdjustmentStartTreatment
         function onAdjustmentTriggered          ( vValue ) {
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r52d17dab2211c2e4d9160c55c316ad7a40ce4d6c -re50998d376110516b4d3c9c860b9cbb4f2013623
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 52d17dab2211c2e4d9160c55c316ad7a40ce4d6c)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision e50998d376110516b4d3c9c860b9cbb4f2013623)
@@ -34,8 +34,7 @@
     function clear( vValue )        { if ( ! vValue ) return;  _preTreatmentCreateContent.clear()                                                               }
     function confirmReady()         { return _root.isFirstTab ? true : _preTreatmentCreateContent.confirmReady()                                                }
     function confirmButtonClicked() { if ( _root.isFirstTab ) { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings; return;  }
-                                      if (vTreatmentCreate.parametersValidated) { _preTreatmentCreateContent.confirm()                                          }
-                                      else                                      { _preTreatmentCreateContent.validate()                                         }}
+                                      _preTreatmentCreateContent.validate() }
     function back()                 { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.PatientPrescription                                   }
 
     PreTreatmentCreateContent { id: _preTreatmentCreateContent
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
===================================================================
diff -u -r773b0b83e72af1bdc50c2643459cb0ef19c02ee6 -re50998d376110516b4d3c9c860b9cbb4f2013623
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 773b0b83e72af1bdc50c2643459cb0ef19c02ee6)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision e50998d376110516b4d3c9c860b9cbb4f2013623)
@@ -67,19 +67,17 @@
     }
 
     function ready () {
-        return _root.isHDFFeatured ? _hdfTreatmentModeControl   .isActive       && _hdfTreatmentMode          .valid            &&
-                                    _subFluidVolume             .isActive       && _subFluidVolume            .valid    : true  &&
-                _bloodFlowRate                                  .isActive       && _bloodFlowRate             .valid            &&
-                _dialysateFlowRate                              .isActive       && _dialysateFlowRate         .valid            &&
-                _duration                                       .isActive       && _duration                  .valid            &&
 
-                _ufVolume                                       .isActive       && _ufVolume                  .valid            &&
-                _root.isHDFFeatured ? _hdfTreatmentMode         .isActive       && _hdfTreatmentMode          .valid            &&
-                                      _subFluidVolume           .isActive       && _hdfTreatmentMode          .valid    : true  &&
-                _root.isHeparinOn && _root. heparinFeatured ?   _heparinRxAdjustment.confirmReady()                     : true  &&
-                _acidConcentrateComboBox                        .isActive       && _acidConcentrate           .valid            &&
-                _bicarbonateConcentrateComboBox                 .isActive       && _bicarbonateConcentrate    .valid            &&
-                _dialyzerTypeComboBox                           .isActive       && _dialyzerType              .valid            &&
+        return (_root.isHDFFeatured ?   _hdfTreatmentModeControl.isActive       && _hdfTreatmentMode          .valid                &&
+                                        _subFluidVolume         .isActive       && _subFluidVolume            .valid    : true )    &&
+                _bloodFlowRate                                  .isActive       && _bloodFlowRate             .valid                &&
+                _dialysateFlowRate                              .isActive       && _dialysateFlowRate         .valid                &&
+                _duration                                       .isActive       && _duration                  .valid                &&
+                _ufVolume                                       .isActive       && _ufVolume                  .valid                &&
+                (_root.isHeparinOn && _root. heparinFeatured ?   _heparinRxAdjustment.confirmReady()                    : true )    &&
+                _acidConcentrateComboBox                        .isActive       && _acidConcentrate           .valid                &&
+                _bicarbonateConcentrateComboBox                 .isActive       && _bicarbonateConcentrate    .valid                &&
+                _dialyzerTypeComboBox                           .isActive       && _dialyzerType              .valid                &&
                 _dialysateTemperature                           .isActive       && _dialysateTemperature      .valid
     }