diff --git a/HeliPort/Appearance/StatusMenu.swift b/HeliPort/Appearance/StatusMenu.swift
index 715155f..71c1369 100644
--- a/HeliPort/Appearance/StatusMenu.swift
+++ b/HeliPort/Appearance/StatusMenu.swift
@@ -435,7 +435,11 @@ final class StatusMenu: NSMenu, NSMenuDelegate {
             }
         case .turnWiFiOn:
             power_on()
+            NetworkManager.scanSavedNetworks()
         case .turnWiFiOff:
+            if status == ITL80211_S_RUN {
+                disassociateSSID(disconnectItem)
+            }
             power_off()
         case .joinNetworks:
             let joinPop = WiFiConfigWindow()
@@ -608,7 +612,6 @@ final class StatusMenu: NSMenu, NSMenuDelegate {
                                                              options: .regularExpression,
                                                              range: nil)
         DispatchQueue.global().async {
-            CredentialsManager.instance.setAutoJoin(ssid, false)
             dis_associate_ssid(ssid)
             Log.debug("Disconnected from \(ssid)")
         }
diff --git a/HeliPort/NetworkManager.swift b/HeliPort/NetworkManager.swift
index ba9314e..2a866f2 100644
--- a/HeliPort/NetworkManager.swift
+++ b/HeliPort/NetworkManager.swift
@@ -59,7 +59,6 @@ final class NetworkManager {
             if let savedNetworkAuth = CredentialsManager.instance.get(networkInfo) {
                 networkInfo.auth = savedNetworkAuth
                 Log.debug("Connecting to network \(networkInfo.ssid) with saved password")
-                CredentialsManager.instance.setAutoJoin(networkInfo.ssid, true)
                 getAuthInfoCallback(networkInfo.auth, false)
                 return
             }