Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -re50998d376110516b4d3c9c860b9cbb4f2013623 -rfb3c31821213807fb8d0e40f4840181f370c23e4
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision e50998d376110516b4d3c9c860b9cbb4f2013623)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml	(.../PreTreatmentStack.qml)	(revision fb3c31821213807fb8d0e40f4840181f370c23e4)
@@ -111,6 +111,7 @@
             break
         case PreTreatmentStack.Step.CreateRx:
             _pretreatmentCreate.confirmButtonClicked()
+            if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentConnect ) }
             break
         case PreTreatmentStack.Step.Connect:
             vPreTreatmentAdjustmentStartTreatment.doStart()
@@ -272,7 +273,7 @@
     // creat rx
     Connections{ target: vTreatmentCreate
         function onDidValidationPass            ( ) {
-            page ( _pretreatmentConnect )
+            if ( _pretreatmentCreate.visible) { page ( _pretreatmentConnect ) }
         }
     }
 
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -re50998d376110516b4d3c9c860b9cbb4f2013623 -rfb3c31821213807fb8d0e40f4840181f370c23e4
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision e50998d376110516b4d3c9c860b9cbb4f2013623)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision fb3c31821213807fb8d0e40f4840181f370c23e4)
@@ -34,7 +34,8 @@
     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;  }
-                                      _preTreatmentCreateContent.validate() }
+                                      if (vTreatmentCreate.parametersValidated) { _preTreatmentCreateContent.confirm()                                          }
+                                      else                                      { _preTreatmentCreateContent.validate()                                         }}
     function back()                 { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.PatientPrescription                                   }
 
     PreTreatmentCreateContent { id: _preTreatmentCreateContent