diff --git a/src/Web/autopilot-monitor-web/app/settings/TenantConfigContext.tsx b/src/Web/autopilot-monitor-web/app/settings/TenantConfigContext.tsx
index 314a8b39..3ac1bb27 100644
--- a/src/Web/autopilot-monitor-web/app/settings/TenantConfigContext.tsx
+++ b/src/Web/autopilot-monitor-web/app/settings/TenantConfigContext.tsx
@@ -1037,19 +1037,36 @@ export function TenantConfigProvider({ children }: { children: React.ReactNode }
         const reconcileTrigger: ValidationTrigger =
           trigger === "corporate" ? "corporate" : trigger === "device-preparation" ? "device-preparation" : "autopilot";
 
-        const probe = await probeAccessCheck();
+        // AAD consent-propagation awareness: right after a successful admin consent the app-only
+        // token often mints with an EMPTY roles claim for 30-90s (observed live 2026-07-31,
+        // tenant 5ca2b350: token 43s post-consent with GrantedRoleCount=0) — a single-shot probe
+        // misclassified that window as "permission not granted" and showed a hard error while
+        // everything was actually fine. The access-check invalidates + re-mints fresh on every
+        // call, so a bounded poll converges as soon as Microsoft has propagated the role. The
+        // consent-in-progress spinner stays up for the duration (finally-block clears it).
+        let probe: AccessCheckOutcome = "absent";
+        let attempts = 0;
+        for (attempts = 1; attempts <= 5; attempts++) {
+          if (attempts > 1) await new Promise((resolve) => setTimeout(resolve, 15000));
+          probe = await probeAccessCheck();
+          if (probe === "reconciled") break;
+        }
+
         if (probe === "reconciled") {
+          if (attempts > 1) trackEvent("consent_verify_propagated", { trigger, attempts: String(attempts) });
           const saved = await persistValidation(reconcileTrigger);
           if (saved) {
             setSuccessMessage(`${validationLabel(reconcileTrigger)}${validationEnabledSuffix(reconcileTrigger)}`);
           }
         } else if (probe === "transient") {
-          trackEvent("consent_verify_failed", { trigger, stage: "role-propagating" });
+          trackEvent("consent_verify_failed", { trigger, stage: "role-propagating", attempts: String(attempts - 1) });
           setError("Admin consent succeeded, but the required permission could not be confirmed yet (access is still propagating). Please retry in a moment — toggle the option again or use 'Detect existing access'.");
         } else {
-          // "absent" — consent went through but the role is genuinely not on the app in this tenant.
-          trackEvent("consent_verify_failed", { trigger, stage: "role-missing" });
-          setError("Admin consent succeeded, but the required permission (DeviceManagementServiceConfig.Read.All) is not granted to the app in this tenant. Ensure it is included when granting consent, then try again.");
+          // "absent" after ~a minute of polling — either the role really is missing from the
+          // consent, or Microsoft's propagation is unusually slow. Keep the message actionable
+          // for both without sounding fatal.
+          trackEvent("consent_verify_failed", { trigger, stage: "role-missing", attempts: String(attempts - 1) });
+          setError("Admin consent succeeded, but the permission (DeviceManagementServiceConfig.Read.All) has not shown up on the app in this tenant yet. This can simply be Microsoft still propagating the consent — wait a minute and use 'Detect existing access'. If it persists, re-run the consent and ensure the permission is included.");
         }
         router.replace("/settings/tenant/autopilot");
       } catch (err) {
diff --git a/src/Web/autopilot-monitor-web/app/settings/tenant/sections/SectionAutopilotValidation.tsx b/src/Web/autopilot-monitor-web/app/settings/tenant/sections/SectionAutopilotValidation.tsx
index 68a60f82..5dd4a391 100644
--- a/src/Web/autopilot-monitor-web/app/settings/tenant/sections/SectionAutopilotValidation.tsx
+++ b/src/Web/autopilot-monitor-web/app/settings/tenant/sections/SectionAutopilotValidation.tsx
@@ -27,7 +27,7 @@ export function SectionAutopilotValidation() {
   // Operators do not see this section at all.
   if (!canEditConfig) {
     return (
-      <div className="bg-amber-50 border border-amber-200 rounded-lg p-4 text-sm text-amber-800">
+      <div className="bg-amber-50 border border-amber-200 rounded-lg p-4 text-sm text-amber-800 dark:bg-amber-900/30 dark:border-amber-700 dark:text-amber-200">
         This page is available to tenant administrators only.
       </div>
     );
@@ -49,7 +49,7 @@ export function SectionAutopilotValidation() {
     <>
       <TenantNotifications />
       {homingFlipped ? (
-        <div className="bg-green-50 border border-green-200 rounded-lg p-4 text-sm text-green-800">
+        <div className="bg-green-50 border border-green-200 rounded-lg p-4 text-sm text-green-800 dark:bg-green-900/30 dark:border-green-700 dark:text-green-200">
           <p>
             Your tenant now runs on the <strong>new</strong> Autopilot Monitor app registration.
             Current sessions keep working; every next sign-in uses the new app automatically.
@@ -62,44 +62,67 @@ export function SectionAutopilotValidation() {
           </button>
         </div>
       ) : appHomingFunnelActive ? (
-        <div className="bg-gradient-to-r from-blue-50 to-indigo-50 border-2 border-blue-300 rounded-lg p-5 shadow-sm">
+        <div className="bg-gradient-to-r from-blue-50 to-indigo-50 border-2 border-blue-300 rounded-lg p-5 shadow-sm dark:from-blue-950/40 dark:to-indigo-950/40 dark:border-blue-700/60">
           <div className="flex items-start gap-3">
-            <svg className="w-6 h-6 text-blue-600 flex-shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <svg className="w-6 h-6 text-blue-600 dark:text-blue-400 flex-shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
               <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13 10V3L4 14h7v7l9-11h-7z" />
             </svg>
-            <div className="text-sm text-blue-900">
+            <div className="text-sm text-blue-900 dark:text-blue-100">
               <p className="font-semibold text-base">
                 Please switch to the new Autopilot Monitor app registration
               </p>
-              <p className="mt-1.5 text-blue-800">
+              <p className="mt-1.5 text-blue-800 dark:text-blue-200">
                 Your tenant still runs on the previous app registration. Granting consent below (or
                 running &quot;Detect existing access&quot;) approves the <strong>new</strong> app and
                 switches your tenant over automatically — current sessions keep working, and new
                 sign-ins use the new app. It&apos;s a one-time step and takes about a minute.
               </p>
-              <p className="mt-1.5 text-blue-800">
+              <p className="mt-1.5 text-blue-800 dark:text-blue-200">
                 <strong>Note:</strong> granting admin consent requires an Entra ID account that can
                 consent tenant-wide (e.g. <strong>Global Administrator</strong> or{" "}
                 <strong>Privileged Role Administrator</strong>). The consented permission stays the
                 same read-only Graph permission as before
-                (<code className="text-xs bg-blue-100 px-1 rounded">DeviceManagementServiceConfig.Read.All</code>).
+                (<code className="text-xs bg-blue-100 dark:bg-blue-900/60 px-1 rounded">DeviceManagementServiceConfig.Read.All</code>).
               </p>
               <a
                 href={`${DOCS_URL}/getting-started/portal-setup`}
                 target="_blank"
                 rel="noopener noreferrer"
-                className="inline-flex items-center gap-1 mt-2.5 text-sm font-medium text-blue-700 hover:text-blue-900 underline"
+                className="inline-flex items-center gap-1 mt-2.5 text-sm font-medium text-blue-700 hover:text-blue-900 underline dark:text-blue-300 dark:hover:text-blue-100"
               >
                 See the documentation for details on the required permissions
                 <svg className="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                   <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
                 </svg>
               </a>
+              {/* Always-visible funnel actions: a tenant whose validations are ALREADY enabled has
+                  no consent button to click (the toggles are on) and the per-toggle "Detect
+                  existing access" links only appear under DISABLED toggles — and would enable that
+                  validation as a side effect. These two act on the existing autopilot gate
+                  (idempotent when it is already on) and never touch the other toggles. */}
+              <div className="mt-3 flex flex-wrap items-center gap-3">
+                <button
+                  type="button"
+                  onClick={() => { void beginDeviceValidationConsentFlow("autopilot"); }}
+                  disabled={autopilotConsentInProgress || savingSection === "autopilotValidation"}
+                  className="px-3 py-1.5 text-sm font-medium text-white bg-blue-600 rounded-lg hover:bg-blue-700 disabled:opacity-60 disabled:cursor-not-allowed transition-colors"
+                >
+                  Grant consent for the new app
+                </button>
+                <button
+                  type="button"
+                  onClick={() => { void detectExistingAccess("autopilot"); }}
+                  disabled={autopilotConsentInProgress || savingSection === "autopilotValidation"}
+                  className="text-sm font-medium text-blue-700 hover:text-blue-900 underline underline-offset-2 disabled:opacity-60 disabled:cursor-not-allowed dark:text-blue-300 dark:hover:text-blue-100"
+                >
+                  Detect existing access
+                </button>
+              </div>
             </div>
           </div>
         </div>
       ) : homedOnLegacyApp ? (
-        <div className="bg-blue-50 border border-blue-200 rounded-lg p-4 text-sm text-blue-800">
+        <div className="bg-blue-50 border border-blue-200 rounded-lg p-4 text-sm text-blue-800 dark:bg-blue-900/30 dark:border-blue-700 dark:text-blue-200">
           Autopilot device validation currently runs on the previous Autopilot Monitor app
           registration. It keeps working as-is — at your convenience, please re-consent to the
           new app registration; we will reach out with details as part of the migration.