Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -re68c1cc0f53b3c03943af4b70c46b5954603b53a
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision e68c1cc0f53b3c03943af4b70c46b5954603b53a)
@@ -119,6 +119,12 @@
         vPostTreatmentAdjustmentTreatmentLog.patientID          = vTreatmentCreate.patientID
         vPostTreatmentAdjustmentTreatmentLog.secondaryPatientID = vTreatmentCreate.secondaryPatientID
         vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0
+
+        if ( ! _preTreatmentCreatePatientPrescription.isHDFFeatured ) {
+            vTreatmentCreate.substitutionFluidVolume    = 0
+            vTreatmentCreate.hdfTreatmentMode           = 0
+        }
+
         vTreatmentCreate.doValidation       (        )
     }
 
@@ -136,6 +142,8 @@
         function onDidValidationPass            ( ) {
             activateAndRefresh() // refresh values on validation
             clearErrors()
+
+            if ( _headerbarPrescription.visible) _headerbarPrescription.close()
         }
     }