Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r77e7c1e746bba703ab3aee61f8e19f398fd9ac00 -r4f5932840bc0a47ffe863cbf9f38dd4b41e1e72a
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 77e7c1e746bba703ab3aee61f8e19f398fd9ac00)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 4f5932840bc0a47ffe863cbf9f38dd4b41e1e72a)
@@ -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     &&