diff --git a/nymea-app/ui/MainMenu.qml b/nymea-app/ui/MainMenu.qml
index a4322fe9..fba2901a 100644
--- a/nymea-app/ui/MainMenu.qml
+++ b/nymea-app/ui/MainMenu.qml
@@ -61,8 +61,6 @@ Drawer {
                     ProgressButton {
                         longpressEnabled: false
                         imageSource: "../images/close.svg"
-                        // When we're connected via command line arg, don't allow disconnecting
-                        visible: autoConnectHost.length === 0
                         onClicked: {
                             root.currentEngine.jsonRpcClient.disconnectFromHost();
                             root.close();
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index 572b0900..f57d2a2d 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -179,10 +179,7 @@ Item {
 
                     Component.onCompleted: {
                         setupPushNotifications();
-                        if (autoConnectHost.length > 0) {
-                            var host = nymeaDiscovery.nymeaHosts.createLanHost("Manual connection", autoConnectHost);
-                            engine.jsonRpcClient.connectToHost(host)
-                        } else if (tabSettings.lastConnectedHost.length > 0) {
+                        if (tabSettings.lastConnectedHost.length > 0) {
                             print("Last connected host was", tabSettings.lastConnectedHost)
                             var cachedHost = nymeaDiscovery.nymeaHosts.find(tabSettings.lastConnectedHost);
                             if (cachedHost) {
@@ -190,7 +187,11 @@ Item {
                                 return;
                             }
                             print("Warning: There is a last connected host but UUID is unknown to discovery...")
+                        } else if (autoConnectHost.length > 0) {
+                            var host = nymeaDiscovery.nymeaHosts.createLanHost(app.systemName, autoConnectHost);
+                            engine.jsonRpcClient.connectToHost(host)
                         }
+
                         PlatformHelper.hideSplashScreen();
                         pageStack.push(Qt.resolvedUrl("connection/ConnectPage.qml"), StackView.Immediate)
                     }