diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a85f692..d03ef72 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -442,9 +442,13 @@ void MainWindow::setupSettingsModal() {
             if (reloadConnection) {
                 // Save settings
                 Settings::getInstance()->saveSettings(settings.cmbServer->currentText());
-                
-                auto cl = new ConnectionLoader(this, rpc);
-                cl->loadConnection();
+
+                // Save the wallet
+                getRPC()->saveWallet([=] (auto) {
+                    // Then reload the connection
+                    auto cl = new ConnectionLoader(this, rpc);
+                    cl->loadConnection();
+                });
             }
         }
     });
diff --git a/src/settings.ui b/src/settings.ui
index 4c031c4..ae44092 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -46,7 +46,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Server</string>
+          <string>Lightwallet Server</string>
          </property>
         </widget>
        </item>