diff --git a/containers/backupchecks/src/templates/documentation/mail-import/setup.html b/containers/backupchecks/src/templates/documentation/mail-import/setup.html
index 4608943..3112705 100644
--- a/containers/backupchecks/src/templates/documentation/mail-import/setup.html
+++ b/containers/backupchecks/src/templates/documentation/mail-import/setup.html
@@ -285,15 +285,20 @@
 
 <div class="doc-callout doc-callout-info">
   <strong>📝 Future Improvement:</strong><br>
-  The current UI requires saving credentials separately before folder browsing is available. A UI improvement is planned to make this workflow clearer, possibly combining these steps or providing better visual feedback about the required order.
+  The current UI requires clicking the same "Save settings" button twice: once to save credentials (which enables folder browsing), and again to save folder paths. This is not immediately obvious to users. A UI improvement is planned to make this workflow clearer - possibly splitting it into separate sections with distinct save buttons, or providing visual feedback about which step you're on.
 </div>
 
-<h3>2.3 Save Final Configuration</h3>
+<h3>2.3 Save Settings (Again)</h3>
 
 <p>After configuring the folder paths:</p>
 
 <ol>
-  <li>Click <strong>Save settings</strong> at the bottom of the page again</li>
+  <li>Click the <strong>Save settings</strong> button at the bottom of the page <strong>again</strong>
+    <ul>
+      <li>This is the same "Save settings" button you clicked in Step 2.1</li>
+      <li>It now saves both credentials and folder paths together</li>
+    </ul>
+  </li>
   <li>BackupChecks will validate the complete configuration (credentials + folders)</li>
   <li>If successful, you'll see a confirmation message</li>
   <li>If there's an error, verify:
@@ -305,9 +310,9 @@
   </li>
 </ol>
 
-<div class="doc-callout doc-callout-tip">
-  <strong>💡 Two Save Steps:</strong><br>
-  You'll save settings twice: first after entering credentials (Step 2.1), then again after selecting folders (Step 2.3). This ensures credentials are available for the folder browser to connect to your mailbox.
+<div class="doc-callout doc-callout-warning">
+  <strong>⚠️ Same Button, Two Steps:</strong><br>
+  There is only <strong>one "Save settings" button</strong> on this page. You must click it <strong>twice</strong>: first after entering credentials (Step 2.1) to enable folder browsing, then again after selecting folders (Step 2.3) to save the complete configuration. This workflow will be improved in a future version to make it clearer.
 </div>
 
 <h2>Step 3: Test the Configuration</h2>
diff --git a/docs/changelog-claude.md b/docs/changelog-claude.md
index d486540..2e2cbe7 100644
--- a/docs/changelog-claude.md
+++ b/docs/changelog-claude.md
@@ -6,7 +6,7 @@ This file documents all changes made to this project via Claude Code.
 
 ### Added
 - Completed Mail & Import documentation section (4 pages):
-  - **Mail Import Setup**: Microsoft Graph API configuration with enhanced security (Azure AD app registration, start with Mail.Read only, Application Access Policy to restrict access to one mailbox via Exchange PowerShell, add Mail.ReadWrite after testing), two-step folder configuration workflow (save credentials first, then use automatic folder browser popup - no manual path entry), test configuration, troubleshooting (authentication errors, folder not found, no emails imported), advanced configuration (email retention, multiple mailboxes), comprehensive security best practices including principle of least privilege, note about planned UI improvement for clearer workflow
+  - **Mail Import Setup**: Microsoft Graph API configuration with enhanced security (Azure AD app registration, start with Mail.Read only, Application Access Policy to restrict access to one mailbox via Exchange PowerShell, add Mail.ReadWrite after testing), two-step save workflow clarification (same "Save settings" button clicked twice - once for credentials to enable folder browsing, then again for complete configuration), automatic folder browser popup (no manual path entry), test configuration, troubleshooting (authentication errors, folder not found, no emails imported), advanced configuration (email retention, multiple mailboxes), comprehensive security best practices including principle of least privilege, note about planned UI improvement to make two-step save workflow more obvious
   - **Inbox Management**: Inbox overview and workflow, table columns explanation, viewing email details (metadata, body iframe, parsed objects), approving emails (customer selection, job name), what happens after approval, re-parsing emails (single and bulk), deleting emails (single and bulk delete, soft delete behavior), downloading .eml files, common workflows (new customer setup, troubleshooting unparsed emails, cleaning spam), best practices
   - **Mail Parsing**: Parsing overview and workflow (retrieval, preprocessing, parser selection, matching, parsing, storage), parsers (viewing available parsers, parser information), match criteria (sender, subject, body match), supported backup software (Veeam, Synology, NAKIVO, Boxafe, Panel3, QNAP, Syncovery, 3CX, RDrive, NTFS Auditing), parser execution order, enabling/disabling parsers, re-parsing emails, parsing workflow example, troubleshooting parsing issues, parser limitations, best practices
   - **Auto-Import Configuration**: Auto-import overview and features, enabling auto-import, import interval configuration (5/15/30/60 minutes), batch size explanation, how auto-import works (timer, check settings, authenticate, fetch, parse, auto-approve, move, log, persist, wait), auto-approval logic and conditions, when auto-approval fails, manual import (triggering, batch size 1-50), import settings summary table, monitoring import activity (audit log, inbox page, jobs/daily jobs), troubleshooting (auto-import not running, emails not auto-approved, import errors), best practices, advanced configuration (disabling temporarily, EML retention, high-volume environments)