Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rb67c15152e0bd979d3a96f44abcea23d22dcd735 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision b67c15152e0bd979d3a96f44abcea23d22dcd735)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -119,6 +119,11 @@
         // store for the TreatmentLog
         vPostTreatmentAdjustmentTreatmentLog.patientID          = vTreatmentCreate.patientID
         vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0
+        if ( ! PreTreatmentCreatePatientPrescription.isHDFFeatured ) {
+            vTreatmentCreate.substitutionFluidVolume    = 0
+            vTreatmentCreate.hdfTreatmentMode           = 0
+        }
+
         vTreatmentCreate.doValidation       (        )
     }
 
@@ -136,6 +141,8 @@
         function onDidValidationPass            ( ) {
             activateAndRefresh() // refresh values on validation
             clearErrors()
+
+            if ( _headerbarPrescription.visible) _headerbarPrescription.close()
         }
     }