Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -ra82ee4f326b26c4369f1306f867edc1bca6dabbe -r627b97843f87f5ca8fbd731c6c4a6d9fae4352ce
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision a82ee4f326b26c4369f1306f867edc1bca6dabbe)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 627b97843f87f5ca8fbd731c6c4a6d9fae4352ce)
@@ -36,7 +36,7 @@
 StackItem { id : _root
 
     // DEBUG: this property can mostly be used for debugging to get pass the initial screen
-    property var initialItem: _postModeScreen // _mainHome
+    property var initialItem: vSettings.noCANBus ? _mainHome : _postModeScreen
 
     stackView.initialItem   : _root.initialItem
 
@@ -118,7 +118,7 @@
         onStartTreatment                : { page( _treatmentStack                                               )}
         onCreateTreatment               : { vPreTreatmentAdjustmentInitTreatment.doInitiate()
             // DEBUG: console.debug(vSettings.categorys)
-            if ( parseInt(vSettings.data["Development/NoCANBus"]["Navigation"]["Create Treatment To Patient ID"]) === 1 )
+            if ( vSettings.noCANBus )
                 vHDOperationMode.validateParametersChanged(true)
         }
         onVisibleChanged: {