diff --git a/src/options/options.html b/src/options/options.html
index 4c4f82e..05f5d7a 100644
--- a/src/options/options.html
+++ b/src/options/options.html
@@ -278,9 +278,11 @@
 
       <!-- Auto Sync -->
       <div style="margin-top:20px;padding-top:16px;border-top:1px solid #e5e7eb">
-        <h3 style="font-size:13px;font-weight:600;margin:0 0 4px">Auto Sync — background polling</h3>
+        <h3 style="font-size:13px;font-weight:600;margin:0 0 4px">Auto Sync — works in all browsers</h3>
         <p class="section-desc" style="margin-bottom:8px">
-          Automatically push and pull settings on an interval. Uses the Gist or URL method configured above.
+          Automatically push and pull settings in the background on a schedule.
+          Uses GitHub Gist or Custom URL — configure one of those above first, then enable auto sync here.
+          Changes you make locally are pushed immediately; remote changes are pulled on the interval.
         </p>
         <div style="display:flex;gap:12px;flex-wrap:wrap;align-items:center;margin-bottom:8px">
           <label class="toggle" title="Enable auto sync">
diff --git a/src/options/options.js b/src/options/options.js
index ee75ddb..5f6bbbc 100644
--- a/src/options/options.js
+++ b/src/options/options.js
@@ -1190,9 +1190,7 @@ async function initAutoSyncUI() {
     $('#autoSyncEnabled').checked = config.enabled || false;
     $('#autoSyncMethod').value = config.method || 'gist';
     $('#autoSyncInterval').value = String(config.interval || 15);
-    if (config.lastPull) {
-      setAutoSyncStatus(`Last pull: ${new Date(config.lastPull).toLocaleString()}`, 'ok');
-    }
+    updateAutoSyncStatus(config);
   }
 
   const saveAutoSync = async () => {
@@ -1201,26 +1199,59 @@ async function initAutoSyncUI() {
     config.method = $('#autoSyncMethod').value;
     config.interval = parseInt($('#autoSyncInterval').value, 10) || 15;
 
-    // Inherit token/URL from existing fields
-    if (config.method === 'gist') {
-      const token = $('#gistToken').value.trim();
-      if (token) config.gistToken = token;
-    } else {
-      config.url = $('#customSyncUrl').value.trim();
-      config.headers = parseHeadersField($('#customSyncHeaders').value);
+    // Always grab the latest token/URL from the page fields
+    // AND persist them so they survive page reloads
+    const gistToken = $('#gistToken').value.trim();
+    if (gistToken) config.gistToken = gistToken;
+    const customUrl = $('#customSyncUrl').value.trim();
+    if (customUrl) config.url = customUrl;
+    config.headers = parseHeadersField($('#customSyncHeaders').value);
+
+    // Validate: need credentials for the chosen method
+    if (config.enabled) {
+      if (config.method === 'gist' && !config.gistToken) {
+        setAutoSyncStatus('Enter your GitHub PAT in the Gist section above first.', 'warn');
+        config.enabled = false;
+        $('#autoSyncEnabled').checked = false;
+      } else if (config.method === 'url' && !config.url) {
+        setAutoSyncStatus('Enter a URL in the Custom URL section above first.', 'warn');
+        config.enabled = false;
+        $('#autoSyncEnabled').checked = false;
+      }
     }
 
     await SilentSendSync.saveAutoSyncConfig(config);
-    // Tell service worker to reconfigure alarm
     api.runtime.sendMessage({ type: 'autosync:config-changed' }).catch(() => {});
-    setAutoSyncStatus(config.enabled ? 'Auto sync enabled.' : 'Auto sync disabled.', config.enabled ? 'ok' : 'neutral');
+    updateAutoSyncStatus(config);
   };
 
+  // Also save token when the Gist token field changes
+  $('#gistToken').addEventListener('change', async () => {
+    const config = (await SilentSendSync.getAutoSyncConfig()) || {};
+    const token = $('#gistToken').value.trim();
+    if (token) {
+      config.gistToken = token;
+      await SilentSendSync.saveAutoSyncConfig(config);
+    }
+  });
+
   $('#autoSyncEnabled').addEventListener('change', saveAutoSync);
   $('#autoSyncMethod').addEventListener('change', saveAutoSync);
   $('#autoSyncInterval').addEventListener('change', saveAutoSync);
 }
 
+function updateAutoSyncStatus(config) {
+  if (!config?.enabled) {
+    setAutoSyncStatus('Auto sync disabled.', 'neutral');
+    return;
+  }
+  const parts = [];
+  parts.push(`${config.method === 'gist' ? 'GitHub Gist' : 'Custom URL'} every ${config.interval}min`);
+  if (config.lastPull) parts.push(`last pull: ${new Date(config.lastPull).toLocaleString()}`);
+  if (config.lastPush) parts.push(`last push: ${new Date(config.lastPush).toLocaleString()}`);
+  setAutoSyncStatus(parts.join(' · '), 'ok');
+}
+
 function setAutoSyncStatus(msg, type) {
   const el = $('#autoSyncStatus');
   if (!el) return;