Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r0dfba44fb7172b9458d161b3ed5f54527f93b698
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 0dfba44fb7172b9458d161b3ed5f54527f93b698)
@@ -30,7 +30,7 @@
     readonly property int rowSpacing    : Variables.defaultMargin * 3
     readonly property int columnSpacing : 15
     readonly property bool isValidated  : vTreatmentCreate.parametersValidated
-    readonly property bool heparinFeatured: true // TODO: vSettings.heparinSyringePump
+    readonly property bool heparinFeatured: vSettings.heparinSyringePump
 
     readonly property string editRx     : qsTr( "Edit Rx"    )
     readonly property string selectRx   : qsTr( "Select Rx"  )
@@ -106,9 +106,9 @@
         return  _bloodFlowRateControl           .isActive     && _bloodFlowRate           .valid  &&
                 _dialysateFlowRateControl       .isActive     && _dialysateFlowRate       .valid  &&
                 _durationControl                .isActive     && _duration                .valid  &&
-                _heparinDispensingRateControl   .isActive     && _heparinDispensingRate   .valid  &&
+                ( _root.heparinFeatured ? _heparinDispensingRateControl   .isActive     && _heparinDispensingRate   .valid  &&
                 _heparinBolusVolumeControl      .isActive     && _heparinBolusVolume      .valid  &&
-                _heparinStopTimeControl         .isActive     && _heparinStopTime         .valid  &&
+                _heparinStopTimeControl         .isActive     && _heparinStopTime         .valid : true ) &&
                 _acidConcentrateComboBox        .isActive     &&
                 _bicarbonateConcentrateComboBox .isActive     &&
                 _dialyzerTypeComboBox           .isActive     &&
@@ -526,7 +526,7 @@
         }
 
         LabelUnitContainer { id: _heparinStopTime
-            text        : qsTr("Heparin Stop Time")
+            text        : qsTr("Heparin Delivery Duration")
             unitText    : Variables.unitTextDuration
             valid       : ! vTreatmentCreate.heparinStopTimeRejectReason
             visible     : _root.heparinFeatured