diff --git a/include/NetworkSettings.h b/include/NetworkSettings.h
index 90d3962b..0594f5ee 100644
--- a/include/NetworkSettings.h
+++ b/include/NetworkSettings.h
@@ -64,6 +64,7 @@ private:
     void handleMDNS();
     void setupMode();
     void NetworkEvent(const WiFiEvent_t event, WiFiEventInfo_t info);
+    void disableAdminMode();
 
     Task _loopTask;
 
diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp
index 167e4dcb..a3eb6ee9 100644
--- a/src/NetworkSettings.cpp
+++ b/src/NetworkSettings.cpp
@@ -206,6 +206,13 @@ void NetworkSettingsClass::enableAdminMode()
     setupMode();
 }
 
+void NetworkSettingsClass::disableAdminMode()
+{
+    _adminEnabled = false;
+    MessageOutput.printf("Admin mode disabled\r\n");
+    setupMode();
+}
+
 String NetworkSettingsClass::getApName() const
 {
     return String(ACCESS_POINT_NAME + String(Utils::getChipId()));
@@ -249,9 +256,7 @@ void NetworkSettingsClass::loop()
         // If WiFi is connected to AP for more than adminTimeoutCounterMax
         // seconds, disable the internal Access Point
         if (_adminTimeoutCounter > _adminTimeoutCounterMax) {
-            _adminEnabled = false;
-            MessageOutput.printf("Admin mode disabled\r\n");
-            setupMode();
+            disableAdminMode();
         }
         // It's nearly not possible to use the internal AP if the
         // WiFi is searching for an AP. So disable searching afer