diff --git a/js/settings.js b/js/settings.js
index c047cac..546bc1b 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -26,6 +26,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     let configuredRoomsState = configuredRooms;
     let authTokensState = authTokens;
+    let serverAuthTokens = authTokens; // canonical server state, re-synced after save
 
     function showStatus(msg, type) {
         statusMsg.textContent = msg;
@@ -88,7 +89,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 tokenDiv.className = 'nc-room-tokens';
                 tokenDiv.id = 'tokens-' + room.token;
                 tokenDiv.style.display = 'none';
-                if (room.configured || (authTokensState[room.token] && authTokensState[room.token].length > 0)) {
+                if (room.configured || (serverAuthTokens[room.token] && serverAuthTokens[room.token].length > 0)) {
                     tokenDiv.style.display = 'block';
                     renderTokens(room.token, tokenDiv);
                 }
@@ -230,22 +231,24 @@ document.addEventListener('DOMContentLoaded', function () {
         saveBtn.disabled = true;
         saveBtn.textContent = 'Saving...';
 
-        // Collect configured rooms
+        // Collect configured rooms from checked checkboxes
         const rooms = {};
         document.querySelectorAll('#nc-rooms-list input[type="checkbox"]:checked').forEach(function (cb) {
             const token = cb.value;
-            rooms[token] = ''; // name will be filled from existing config
+            rooms[token] = configuredRoomsState[token] || ''; // preserve name from existing config
         });
 
-        // Restore names from existing config for newly checked rooms
+        // Remove rooms that were previously configured but are now unchecked
+        const disabledRooms = [];
         Object.keys(configuredRoomsState).forEach(function (token) {
             if (rooms[token] === undefined) {
-                rooms[token] = configuredRoomsState[token];
+                disabledRooms.push(token);
             }
         });
 
         const payload = {
             rooms: rooms,
+            disabled_rooms: disabledRooms,
             auth_tokens: authTokensState,
             retention_days: parseInt(retentionInput.value) || 90,
             sender_name: senderNameInput.value || 'Webhook Bot',
@@ -265,6 +268,18 @@ document.addEventListener('DOMContentLoaded', function () {
 
             if (data.status === 'ok') {
                 configuredRoomsState = rooms;
+                // Sync auth tokens from server to fix state drift
+                if (data.auth_tokens) {
+                    serverAuthTokens = data.auth_tokens;
+                    authTokensState = Object.assign({}, serverAuthTokens);
+                    // Re-render token divs for re-enabled rooms
+                    document.querySelectorAll('#nc-rooms-list input[type="checkbox"]:checked').forEach(function (cb) {
+                        const tokenDiv = document.getElementById('tokens-' + cb.value);
+                        if (tokenDiv && tokenDiv.style.display !== 'none') {
+                            renderTokens(cb.value, tokenDiv);
+                        }
+                    });
+                }
                 showStatus('Configuration saved', 'success');
                 botPasswordInput.value = '';
             } else {
diff --git a/lib/Controller/WebhookController.php b/lib/Controller/WebhookController.php
index 8c35212..b9a07b2 100644
--- a/lib/Controller/WebhookController.php
+++ b/lib/Controller/WebhookController.php
@@ -191,7 +191,10 @@ class WebhookController extends Controller {
 
         $this->talkService->saveConfig($config);
 
-        return new DataResponse(['status' => 'ok']);
+        return new DataResponse([
+            'status' => 'ok',
+            'auth_tokens' => $this->talkService->getAuthTokens(),
+        ]);
     }
 
     /**
diff --git a/lib/Service/TalkService.php b/lib/Service/TalkService.php
index 943a53e..714868e 100644
--- a/lib/Service/TalkService.php
+++ b/lib/Service/TalkService.php
@@ -543,7 +543,7 @@ class TalkService {
             $response = $client->get($url, [
                 'timeout' => 15,
                 'nextcloud' => [
-                    'allow_local_address' => false,
+                    'allow_local_address' => true,
                 ],
             ]);
 
@@ -710,7 +710,7 @@ class TalkService {
                     'Content-Type' => 'application/json',
                 ],
                 'nextcloud' => [
-                    'allow_local_address' => false,
+                    'allow_local_address' => true,
                 ],
             ]);
 
@@ -804,6 +804,7 @@ class TalkService {
      *     bot_password?: string,
      *     retention_days?: int,
      *     rooms?: array<string, string>,
+     *     disabled_rooms?: array<string>,
      *     auth_tokens?: array<string, string[]>,
      *     sender_name?: string
      * }
@@ -821,6 +822,15 @@ class TalkService {
             $this->setRooms($config['rooms']);
         }
 
+        // Remove explicitly disabled rooms from config
+        if (isset($config['disabled_rooms']) && is_array($config['disabled_rooms'])) {
+            $rooms = $this->getRooms();
+            foreach ($config['disabled_rooms'] as $token) {
+                unset($rooms[$token]);
+            }
+            $this->setRooms($rooms);
+        }
+
         if (isset($config['auth_tokens'])) {
             $this->setAuthTokens($config['auth_tokens']);
         }
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 4d84a56..0b48f16 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -23,7 +23,7 @@ class Admin implements ISettings {
         $params = [
             'hasBotPassword' => $this->talkService->hasBotPassword(),
             'retentionDays' => $this->talkService->getRetentionDays(),
-            'rooms' => $this->talkService->getAvailableTalkRooms(),
+            'rooms' => $this->talkService->getRooms(),
             'authTokens' => $this->talkService->getAuthTokens(),
             'configuredRooms' => $this->talkService->getRooms(),
             'serverUrl' => $this->talkService->getBaseUrl(),