Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43 -re12570fc8c5e8a16e27875635daee81422ea3abb
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision e12570fc8c5e8a16e27875635daee81422ea3abb)
@@ -182,8 +182,9 @@
                     let mObject = _heparinStopTime
 
                     if ( ! mActive ) {
-                        mObject.enabled = false
-                        mObject.active  = false
+                        mObject.enabled     = false
+                        mObject.active      = false
+                        mObject.adjustable  = false
                     }
                 }
 
@@ -192,17 +193,11 @@
                     let mChecked = _heparinDispensingRateSwitch.checked
                     let mObject  = _heparinStopTime
 
-                    if ( ! mChecked ) {
-                        mObject.enabled = false
-                        mObject.value   = 0
-                        if ( mActive ) {
-                            mObject.active = true
-                        }
-                    }
-                    else { // already active
-                        mObject.enabled = true
-                        mObject.active  = true
-                    }
+                    mObject.enabled     = mActive && mChecked
+                    mObject.active      = mActive && ! mChecked
+                    mObject.adjustable  = mChecked
+
+                    if ( ! mChecked ) mObject.value       = 0
                 }
             }
 
@@ -233,6 +228,9 @@
                 //            This is a full implementation of a Switch
                 Switch { id: _heparinDispensingRateSwitch
                     property bool active: false
+                    onActiveChanged : {
+                        _heparinDispensingRate.active           = active
+                    }
                     onCheckedChanged: {
                         if ( ! active ) {
                             active = true
@@ -372,6 +370,7 @@
                 value       : vTreatmentRanges.heparinStopTimeDef
                 valid       : !vTreatmentCreate.heparinStopTimeRejectReason
                 enabled         : false // this switch depends on the heparin dispencing
+                adjustable      : false // this switch depends on the heparin dispencing
                 enableAdjustButtons: _heparinDispensingRateSwitch.checked
                 onValueChanged: {
                     // Reset the valid state to allow repositioning to the next invalid parameter