Index: sources/gui/qml/components/BaseComboBox.qml
===================================================================
diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -r555ee09fefaaeff952a24b735f1e40e67ada7cec
--- sources/gui/qml/components/BaseComboBox.qml	(.../BaseComboBox.qml)	(revision c1651f840faf3ed767fb19b76742b68401f96272)
+++ sources/gui/qml/components/BaseComboBox.qml	(.../BaseComboBox.qml)	(revision 555ee09fefaaeff952a24b735f1e40e67ada7cec)
@@ -40,8 +40,6 @@
 
     signal clear()
 
-    onClear                 : { currentIndex    = 0 }
-
     contentItem: Text { id: _displayText
         text                : canOff && parent.displayText === "0" ? qsTr("OFF") : parent.displayText
         color               : Colors.offWhite
Index: sources/gui/qml/dialogs/EndTreatmentDialog.qml
===================================================================
diff -u -r99e596082b87afd73b06dae039d51e4a67cc5913 -r555ee09fefaaeff952a24b735f1e40e67ada7cec
--- sources/gui/qml/dialogs/EndTreatmentDialog.qml	(.../EndTreatmentDialog.qml)	(revision 99e596082b87afd73b06dae039d51e4a67cc5913)
+++ sources/gui/qml/dialogs/EndTreatmentDialog.qml	(.../EndTreatmentDialog.qml)	(revision 555ee09fefaaeff952a24b735f1e40e67ada7cec)
@@ -37,7 +37,7 @@
         }
         color               : Colors.textMain
         font.pixelSize      : Fonts.fontPixelNotification
-        text                : qsTr("Stay on treatment if blood sample is required.")
+        text                : qsTr("Remain on treatment if blood sample is required.")
     }
 
     Connections            { target : vTreatmentAdjustmentEnd
Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml
===================================================================
diff -u -r6825a57fe430253271712f0afbac14d046b44794 -r555ee09fefaaeff952a24b735f1e40e67ada7cec
--- sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml	(.../PostTreatmentDisinfection.qml)	(revision 6825a57fe430253271712f0afbac14d046b44794)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentDisinfection.qml	(.../PostTreatmentDisinfection.qml)	(revision 555ee09fefaaeff952a24b735f1e40e67ada7cec)
@@ -58,7 +58,7 @@
                 delegateBorderWidth : 1
                 delegateBorderColor : Colors.panelBorderColor
                 itemsHasIndent      : Array(itemsText.length).fill(true) // sets all to true
-                itemsText           : [ qsTr("Rinseback")                   ,
+                itemsText           : [ qsTr("Rinse")                       ,
                                         qsTr("Heat Disinfect")              ,
                                         qsTr("Citric Acid Heat Disinfect")  ,
                                         qsTr("Substitution Port Disinfect") ]
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -r555ee09fefaaeff952a24b735f1e40e67ada7cec
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision c1651f840faf3ed767fb19b76742b68401f96272)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 555ee09fefaaeff952a24b735f1e40e67ada7cec)
@@ -21,7 +21,6 @@
 
     spacing      : Variables.defaultMargin * 3
 
-
     enum HeparinEnabled {
         OFF,
         ON
@@ -128,6 +127,7 @@
                 textInput.validator         : RegExpValidator { regExp: Variables.regExp_PatientID }
                 line.visible                : false
                 enabled                     : _root.editingEnabled
+                textInput.onTextChanged     : vTreatmentCreate.patientID = textInput.text
 
                 Text { id: _patientIDPlaceHolderText
                     text                : Variables.emptyEntry