diff --git a/electrum/gui/qml/components/controls/ServerConfig.qml b/electrum/gui/qml/components/controls/ServerConfig.qml
index a18056869..32f1e0384 100644
--- a/electrum/gui/qml/components/controls/ServerConfig.qml
+++ b/electrum/gui/qml/components/controls/ServerConfig.qml
@@ -5,9 +5,11 @@ import QtQuick.Controls.Material 2.0
 
 import org.electrum 1.0
 
+
 Item {
     id: root
 
+    property bool showAutoselectServer: true
     property alias auto_connect: auto_server_cb.checked
     property alias address: address_tf.text
 
@@ -22,27 +24,26 @@ Item {
 
         CheckBox {
             id: auto_server_cb
+            visible: showAutoselectServer
             text: qsTr('Select server automatically')
             checked: true
         }
 
-        GridLayout {
-            columns: 2
-            Layout.fillWidth: true
+        Label {
+            text: qsTr("Server")
+            enabled: address_tf.enabled
+        }
 
-            Label {
-                text: qsTr("Server")
-                enabled: address_tf.enabled
-            }
+        TextHighlightPane {
+            Layout.fillWidth: true
 
             TextField {
                 id: address_tf
                 enabled: !auto_server_cb.checked
-                Layout.fillWidth: true
+                width: parent.width
             }
         }
 
-
         ColumnLayout {
             Heading {
                 text: qsTr('Servers')
diff --git a/electrum/gui/qml/components/wizard/WCAutoConnect.qml b/electrum/gui/qml/components/wizard/WCAutoConnect.qml
index 46fa118e3..2e52718cc 100644
--- a/electrum/gui/qml/components/wizard/WCAutoConnect.qml
+++ b/electrum/gui/qml/components/wizard/WCAutoConnect.qml
@@ -1,3 +1,4 @@
+import QtQuick 2.15
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.1
 
diff --git a/electrum/gui/qml/components/wizard/WCProxyConfig.qml b/electrum/gui/qml/components/wizard/WCProxyConfig.qml
index 94b7c6ec4..3bf1abd64 100644
--- a/electrum/gui/qml/components/wizard/WCProxyConfig.qml
+++ b/electrum/gui/qml/components/wizard/WCProxyConfig.qml
@@ -15,10 +15,6 @@ WizardComponent {
         width: parent.width
         spacing: constants.paddingLarge
 
-        Label {
-            text: qsTr('Proxy settings')
-        }
-
         ProxyConfig {
             id: pc
             Layout.fillWidth: true
diff --git a/electrum/gui/qml/components/wizard/WCServerConfig.qml b/electrum/gui/qml/components/wizard/WCServerConfig.qml
index 3788386bc..4b76fb255 100644
--- a/electrum/gui/qml/components/wizard/WCServerConfig.qml
+++ b/electrum/gui/qml/components/wizard/WCServerConfig.qml
@@ -9,7 +9,7 @@ WizardComponent {
     last: true
 
     function apply() {
-        wizard_data['autoconnect'] = sc.auto_connect
+        wizard_data['autoconnect'] = false
         wizard_data['server'] = sc.address
     }
 
@@ -17,13 +17,10 @@ WizardComponent {
         anchors.fill: parent
         spacing: constants.paddingLarge
 
-        Label {
-            text: qsTr('Server settings')
-        }
-
         ServerConfig {
             id: sc
-            width: parent.width
+            showAutoselectServer: false
+            Layout.fillWidth: true
             Layout.fillHeight: true
         }
     }