diff --git a/frontend-modern/src/components/Settings/QuickSecuritySetup.tsx b/frontend-modern/src/components/Settings/QuickSecuritySetup.tsx
index 5842a3108..f585c1da4 100644
--- a/frontend-modern/src/components/Settings/QuickSecuritySetup.tsx
+++ b/frontend-modern/src/components/Settings/QuickSecuritySetup.tsx
@@ -379,6 +379,9 @@ Important:
                   {copied() === 'token' ? 'Copied!' : 'Copy'}
                 </button>
               </div>
+              <p class="text-xs text-gray-500 dark:text-gray-400 mt-2">
+                This is your API token for automation. Use with X-API-Token header.
+              </p>
             </div>
           </div>
 
diff --git a/frontend-modern/src/components/Settings/Settings.tsx b/frontend-modern/src/components/Settings/Settings.tsx
index 14e0ab1da..048a9ce8b 100644
--- a/frontend-modern/src/components/Settings/Settings.tsx
+++ b/frontend-modern/src/components/Settings/Settings.tsx
@@ -1513,8 +1513,9 @@ const Settings: Component = () => {
                 <QuickSecuritySetup />
               </Show>
 
-              {/* API Tokens */}
-              <Show when={securityStatus()?.hasAuthentication}>
+              {/* API Tokens - Only show if NOT using Quick Security Setup */}
+              {/* Quick Security Setup manages its own API token via systemd */}
+              <Show when={false}>
                 <div class="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 p-6">
                   <h3 class="text-lg font-semibold text-gray-800 dark:text-gray-200 mb-4">API Tokens</h3>
                   <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">