Index: sources/cloudsync/CloudSyncController.cpp
===================================================================
diff -u -rc36f8432854c8ab42f71b76da826b50912822cf7 -rdd620cd700a2e976b49aaf0b6fb00839abad740d
--- sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision c36f8432854c8ab42f71b76da826b50912822cf7)
+++ sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision dd620cd700a2e976b49aaf0b6fb00839abad740d)
@@ -1116,6 +1116,9 @@
 void CloudSyncController::testReady()
 {
     bool ok = _postPass && isRegistered();
+#ifdef BUILD_FOR_DESKTOP
+    ok = true;
+#endif
     emit didCloudSyncStatus( ok
                              || gDisableCloudSyncFailStop // Development testability
                             );
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rdd620cd700a2e976b49aaf0b6fb00839abad740d
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(.../PreTreatmentCreateStack.qml)	(revision dd620cd700a2e976b49aaf0b6fb00839abad740d)
@@ -45,7 +45,7 @@
             return
         }
 
-        _root.patientID = ""
+              _pretreatmentPatientID.clear   ()
         page( _pretreatmentPatientID )
               _pretreatmentPatientID.setFocus()
     }
Index: sources/gui/qml/pages/settings/SettingsBase.qml
===================================================================
diff -u -rc36f8432854c8ab42f71b76da826b50912822cf7 -rdd620cd700a2e976b49aaf0b6fb00839abad740d
--- sources/gui/qml/pages/settings/SettingsBase.qml	(.../SettingsBase.qml)	(revision c36f8432854c8ab42f71b76da826b50912822cf7)
+++ sources/gui/qml/pages/settings/SettingsBase.qml	(.../SettingsBase.qml)	(revision dd620cd700a2e976b49aaf0b6fb00839abad740d)
@@ -42,7 +42,7 @@
     property alias  title               : _titleText.text
 
     property alias  notificationText    : _information.text
-    property int    notificationMargin  : Variables.mainMenuHeight + Variables.minVGap
+    property int    notificationMargin  : Variables.notificationHeight + Variables.minVGap
 
     property alias     backVisible      : _backButton   .visible
     property alias     backEnabled      : _backButton   .enabled
@@ -103,7 +103,7 @@
         textColor   : Colors.white
         imageSource : ""
         text        : ""
-        anchors.bottomMargin: _root.notificationBottomMargin
+        anchors.bottomMargin: _root.notificationMargin
     }
 
     onVisibleChanged: {
Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml
===================================================================
diff -u -rc36f8432854c8ab42f71b76da826b50912822cf7 -rdd620cd700a2e976b49aaf0b6fb00839abad740d
--- sources/gui/qml/pages/settings/SettingsExportLogs.qml	(.../SettingsExportLogs.qml)	(revision c36f8432854c8ab42f71b76da826b50912822cf7)
+++ sources/gui/qml/pages/settings/SettingsExportLogs.qml	(.../SettingsExportLogs.qml)	(revision dd620cd700a2e976b49aaf0b6fb00839abad740d)
@@ -84,9 +84,8 @@
     readonly property bool   horizontalLayout               : _GuiView.useLongLogName
 
     confirmVisible                                          : false
-    notificationMargin                                      : Variables.minVGap
-    bottomMarginContent                                     : Variables.settingsContentBottomMargin
-                                                            - Variables.mainMenuHeight // utilize the height of the main menu in its absense.
+    notificationMargin                                      : Variables.notificationHeight
+    bottomMarginContent                                     : Variables.settingsContentBottomMargin - Variables.minVGap
 
     function refreshModels() {
         _usbFolderColumn.clearModel()
Index: sources/storage/TreatmentLog.cpp
===================================================================
diff -u -re38423dd3840e625ed0728d9b0fb3f9eb9292500 -rdd620cd700a2e976b49aaf0b6fb00839abad740d
--- sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision e38423dd3840e625ed0728d9b0fb3f9eb9292500)
+++ sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision dd620cd700a2e976b49aaf0b6fb00839abad740d)
@@ -22,7 +22,6 @@
 #include "FileHandler.h"
 #include "ApplicationController.h"
 #include "Logger.h"
-// #include "MSettings.h"
 #include "Settings.h"
 #include "CloudSyncController.h"
 
@@ -32,7 +31,12 @@
 #define FLOAT3 0,'f',3
 #define ADDTITLE(vTITLE) logContent += QString("[%1]\n").arg(vTITLE)
 #define ADDALINE(vTEXT ) logContent += QString("%1\n"  ).arg(vTEXT )
-#define ADDTOLOG(vINDEX) index = vINDEX; logContent += title(index) + _sep + value(index) + _sep + unit(index) + "\n";
+#define ADDTOLOG(   vINDEX         ) index = vINDEX; logContent += title(index) + _sep + value(index) + _sep + unit(index) + "\n";
+#define ADDTOLOG_MT(vINDEX, vVALUE )                        \
+                        index = vINDEX;                     \
+                        logContent += title(index) + _sep + \
+                    (   value(index).trimmed().isEmpty()  ? vVALUE : value(index) ) + _sep + \
+                        unit(index) + "\n";
 
 /*!
  * \brief TreatmentLog::TreatmentLog
@@ -332,7 +336,7 @@
     ADDTITLE("Title");
     ADDALINE(txCode
                  .arg(_txCodeKey).arg(_gTxCode) );
-    ADDTOLOG( ePatientID                        );
+    ADDTOLOG_MT( ePatientID, _emptyPatinetID    );
 
     ADDTITLE("Treatment Parameters"             );
     ADDTOLOG( eTreatmentDuration                );
@@ -642,6 +646,7 @@
     if ( pendingFiles.count() ) {
         // the most recent/first Tx file, to first ask for the current treatment which has just saved as pending on screen
         _pendingTxr = pendingFiles.first().absoluteFilePath();
+        // DEBUG qDebug() << _pendingTxr;
         if (pendingTxr != _pendingTxr ) {
             pendingTxr  = _pendingTxr;
             findTxCode();
Index: sources/storage/TreatmentLog.h
===================================================================
diff -u -re38423dd3840e625ed0728d9b0fb3f9eb9292500 -rdd620cd700a2e976b49aaf0b6fb00839abad740d
--- sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision e38423dd3840e625ed0728d9b0fb3f9eb9292500)
+++ sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision dd620cd700a2e976b49aaf0b6fb00839abad740d)
@@ -89,6 +89,7 @@
 
     QString _deviceID       = "unknown";
     QString _pendingTxr     = "";
+    QString _emptyPatinetID = "NoPatientIDEntered"; // No translation
 
     MEMBER( QString     , gTxCode, ""); // content of this value is generated by VPreTreatment.
     MEMBER( QString     , rTxCode, ""); // content of this value be received from CloudSync App.