diff --git a/src/connection.cpp b/src/connection.cpp
index 3b16f25..a09b70b 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -726,6 +726,13 @@ std::shared_ptr<ConnectionConfig> ConnectionLoader::autoDetectHushConf() {
     if (hushconf->port.isEmpty()) hushconf->port = "18031";
     file.close();
 
+    // Save to Qsettings
+    Settings::getInstance()->saveSettings(
+        hushconf->host,
+        hushconf->port,
+        hushconf->rpcuser,
+        hushconf->rpcpassword);
+
     // In addition to the HUSH3/HUSH3.conf file, also double check the params. 
 
     return std::shared_ptr<ConnectionConfig>(hushconf);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a7da73b..29e95d8 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -520,10 +520,10 @@ void MainWindow::setupSettingsModal() {
         auto hushConfLocation = Settings::getInstance()->getHushdConfLocation();
         if (!hushConfLocation.isEmpty()) {
             settings.confMsg->setText("Settings are being read from \n" + hushConfLocation);
-            settings.hostname->setEnabled(false);
-            settings.port->setEnabled(false);
-            settings.rpcuser->setEnabled(false);
-            settings.rpcpassword->setEnabled(false);         
+            settings.hostname->setReadOnly(true);
+            settings.port->setReadOnly(true);
+            settings.rpcuser->setReadOnly(true);
+            settings.rpcpassword->setReadOnly(true);
         } else {
             settings.confMsg->setText("No local HUSH3.conf found. Please configure connection manually.");
             settings.hostname->setEnabled(true);
diff --git a/src/rescandialog.ui b/src/rescandialog.ui
index f81e06f..65e1ea1 100644
--- a/src/rescandialog.ui
+++ b/src/rescandialog.ui
@@ -44,7 +44,7 @@
    <item row="2" column="0" colspan="3">
     <widget class="QLineEdit" name="rescanBlockheight"/>
    </item>
-   <item row="0" column="0">
+   <item row="0" column="0" colspan="3">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Enter block height to rescan from:</string>
diff --git a/src/settings.ui b/src/settings.ui
index 1a6830f..e1cc096 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -26,7 +26,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">