Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -rb4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4 -r582bf281f35b9d85aea94e351b9ab15f15258b06
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision b4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 582bf281f35b9d85aea94e351b9ab15f15258b06)
@@ -20,7 +20,8 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/pages/pretreatment"
+import "qrc:/pages/pretreatment/"
+import "qrc:/pages/pretreatment/create"
 
 /*!
  * \brief   Pre-Treatment create screen
@@ -43,8 +44,8 @@
     function clear( vValue ) { if ( ! vValue ) return;  _preTreatmentCreateContent.clear()  }
 
     function confirm(){
-    }
         _preTreatmentCreateContent.confirm()
+    }
     function validate(){
         _preTreatmentCreateContent.validate()
     }
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rb4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4 -r582bf281f35b9d85aea94e351b9ab15f15258b06
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision b4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 582bf281f35b9d85aea94e351b9ab15f15258b06)
@@ -115,7 +115,7 @@
                 _dialyzerTypeComboBox           .isActive     &&
                 _dialysateTemperatureControl    .isActive     && _dialysateTemperature    .valid  &&
                 _salineBolusVolumeControl       .isActive     && _salineBolusVolume       .valid  &&
-                _bpMeasurementIntervalControl   .isActive
+                _bpMeasurementIntervalControl   .isActive     &&
                 (_root.isRxProfile ? _patientID.text != "" : true )
     }
 
@@ -193,10 +193,11 @@
             if ( vTreatmentCreate.parametersValidated ) { vTreatmentCreate.doCancel() }
 
             if      ( selectedItem === _root.editRx     )   { /*All parameters set to edit if parameters are validated */   }
-            else if ( selectedItem === _root.selectRx   )   { print("TODO: Open and Select from Prescription Manager")      }
+            else if ( selectedItem === _root.selectRx   )   { print("TODO: Open and Select from Prescription Manager")
+                                                             _rxManagerDialog.open()   }
             else if ( selectedItem === _root.clearAll   )   { _root.clear()                                                 }
             else                                            {  /*Unknown state */                                           }
-                _rxManagerDialog.open()
+
         }
     }
 
@@ -221,14 +222,14 @@
 
             LabelUnitContainer { id: _patientID
                 anchors.verticalCenter          : parent.verticalCenter
-                text                            : qsTr("Patient ID")
+                text                            :_root.isRxProfile ? qsTr("Profile Name") : qsTr("Patient ID")
                 height                          : cellHeight - Variables.defaultMargin
                 contentArea.anchors.leftMargin  : 120
 
                 contentItem : TextEntry { id: _pretreatmentPatientIDEntry
                     textInput.width             : parent.width - Variables.defaultMargin * 4
                     clip                        : true
-                    text                            : _root.isRxProfile ? qsTr("Profile Name") : qsTr("Patient ID")
+                    text                        : vTreatmentCreate.patientID
                     anchors.centerIn            : parent
                     textInput.maximumLength     : 20  // LEAHI-PRS-236
                     textInput.rightPadding      : Variables.defaultMargin
@@ -239,7 +240,9 @@
                     enabled                     : _root.editingEnabled
                     onEditingFinished           : vTreatmentCreate.patientID = text
 
-                        textInput.validator         : RegExpValidator { regExp: _root.isRxProfile
+                    textInput.validator         : RegExpValidator  { regExp: _root.isRxProfile
+                                                                           ? Variables.regExp_RxProfileName
+                                                                           : Variables.regExp_PatientID }
                     Text { id: _patientIDPlaceHolderText
                         text                : Variables.emptyEntry
                         anchors.fill        : parent
@@ -261,13 +264,13 @@
             QRCode { id: _qrCode
                 anchors.verticalCenter      : parent.verticalCenter
                 anchors.verticalCenterOffset: -5
-                qrcode          : vTreatmentCreate.txCode
+                qrcode          : _root.isRxProfile ? "" : vTreatmentCreate.txCode
                 clear           : ! _root.visible
             }
 
             Text { id: _txCode
                 anchors.bottom  : _qrCode.bottom
-                text            : vTreatmentCreate.txCode ? qsTr("Tx Code: ") + vTreatmentCreate.txCode : " "
+                text            : _root.isRxProfile ? " " : (vTreatmentCreate.txCode ? qsTr("Tx Code: ") + vTreatmentCreate.txCode : " ")
                 color           : "#DBE9FA"
                 font.pixelSize  : Fonts.fontPixelButton
             }