Index: sources/gui/qml/dialogs/HeparinRxAdjustment.qml
===================================================================
diff -u -r63d974e3d2d03c93e0398de17bd6ca2d2e039982 -rd01d12afc4afacb7139315e91825ebbd5b6af748
--- sources/gui/qml/dialogs/HeparinRxAdjustment.qml	(.../HeparinRxAdjustment.qml)	(revision 63d974e3d2d03c93e0398de17bd6ca2d2e039982)
+++ sources/gui/qml/dialogs/HeparinRxAdjustment.qml	(.../HeparinRxAdjustment.qml)	(revision d01d12afc4afacb7139315e91825ebbd5b6af748)
@@ -110,7 +110,7 @@
         }
 
         LabelUnitValueAdjuster { id: _heparinDispensingRate
-            text            : qsTr("Heparin Dispensing Rate")
+            text            : qsTr("Heparin Delivery Rate")
             unitText        : Variables.unitTextDispensingRate
             valid           : ! vTreatmentCreate.heparinDispensingRateRejectReason
             width           : _root.cellWidth
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r48b04367d9f229104e4048783df91089d0106379 -rd01d12afc4afacb7139315e91825ebbd5b6af748
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 48b04367d9f229104e4048783df91089d0106379)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision d01d12afc4afacb7139315e91825ebbd5b6af748)
@@ -131,6 +131,7 @@
             if ( vValue ) {
                 _preTreatmentCreateTreatmentSettings    .setPresetParameters ()
                 _preTreatmentCreatePatientPrescription  .setPresetParameters ()
+                _prescriptionMenu.index = PreTreatmentCreateContent.PatientPrescription // reset tab to first tab on new treatment
             }
         }
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
===================================================================
diff -u -r48b04367d9f229104e4048783df91089d0106379 -rd01d12afc4afacb7139315e91825ebbd5b6af748
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision 48b04367d9f229104e4048783df91089d0106379)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml	(.../PreTreatmentCreateTreatmentSettings.qml)	(revision d01d12afc4afacb7139315e91825ebbd5b6af748)
@@ -38,6 +38,8 @@
     function setPresetParameters () {
         vTreatmentCreate.dialysateTempSet = true
         vTreatmentCreate.dialysateTemp = vTreatmentRanges.dialysateTempDef
+        _heparinRxControl.value = 0
+        _heparinRx.reset()
     }
 
     function refreshAll () {
@@ -289,6 +291,12 @@
             needsAttention  : ! _heparinRxAdjustment.confirmReady()
             editEnabled     : _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON
 
+            function reset() {
+                vTreatmentCreate.heparinBolusVolume       = 0
+                vTreatmentCreate.heparinDispensingRate    = 0
+                vTreatmentCreate.heparinDeliveryDuration  = 0
+            }
+
             contentItem : ValueAdjusterCustom { id: _heparinRxControl
                 defaultValue    : 0
                 value           : 0
@@ -300,9 +308,7 @@
                         _heparinRxAdjustment.open()
                     }
                     else {
-                        vTreatmentCreate.heparinBolusVolume       = 0
-                        vTreatmentCreate.heparinDispensingRate    = 0
-                        vTreatmentCreate.heparinDeliveryDuration  = 0
+                        reset()
                     }
                 }
             }