diff --git a/manifest.json b/manifest.json
index 7d1898e..cfc31cc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "多页面自动化",
-  "version": "6.1.0",
+  "version": "6.4.0",
   "description": "用于自动执行多步骤 OAuth 注册流程",
   "permissions": [
     "sidePanel",
@@ -29,7 +29,11 @@
         "https://auth.openai.com/*",
         "https://accounts.openai.com/*"
       ],
-      "js": ["content/activation-utils.js", "content/utils.js", "content/signup-page.js"],
+      "js": [
+        "content/activation-utils.js",
+        "content/utils.js",
+        "content/signup-page.js"
+      ],
       "run_at": "document_idle"
     },
     {
@@ -37,7 +41,11 @@
         "https://mail.qq.com/*",
         "https://wx.mail.qq.com/*"
       ],
-      "js": ["content/activation-utils.js", "content/utils.js", "content/qq-mail.js"],
+      "js": [
+        "content/activation-utils.js",
+        "content/utils.js",
+        "content/qq-mail.js"
+      ],
       "all_frames": true,
       "run_at": "document_idle"
     },
@@ -47,7 +55,11 @@
         "https://*.mail.163.com/*",
         "https://webmail.vip.163.com/*"
       ],
-      "js": ["content/activation-utils.js", "content/utils.js", "content/mail-163.js"],
+      "js": [
+        "content/activation-utils.js",
+        "content/utils.js",
+        "content/mail-163.js"
+      ],
       "all_frames": true,
       "run_at": "document_idle"
     },
@@ -55,7 +67,11 @@
       "matches": [
         "https://duckduckgo.com/email/settings/autofill*"
       ],
-      "js": ["content/activation-utils.js", "content/utils.js", "content/duck-mail.js"],
+      "js": [
+        "content/activation-utils.js",
+        "content/utils.js",
+        "content/duck-mail.js"
+      ],
       "run_at": "document_idle"
     }
   ],
@@ -71,4 +87,4 @@
     "48": "icons/icon48.png",
     "128": "icons/icon128.png"
   }
-}
+}
\ No newline at end of file
diff --git a/sidepanel/sidepanel.html b/sidepanel/sidepanel.html
index af607f4..0672064 100644
--- a/sidepanel/sidepanel.html
+++ b/sidepanel/sidepanel.html
@@ -137,7 +137,7 @@
           <option value="inbucket">Inbucket（自定义主机）</option>
         </select>
       </div>
-      <div class="data-row">
+      <div class="data-row" id="row-email-generator">
         <span class="data-label">邮箱生成</span>
         <select id="select-email-generator" class="data-select">
           <option value="duck">DuckDuckGo</option>
diff --git a/sidepanel/sidepanel.js b/sidepanel/sidepanel.js
index 918c507..1f7ef0f 100644
--- a/sidepanel/sidepanel.js
+++ b/sidepanel/sidepanel.js
@@ -57,6 +57,7 @@ const inputSub2ApiPassword = document.getElementById('input-sub2api-password');
 const rowSub2ApiGroup = document.getElementById('row-sub2api-group');
 const inputSub2ApiGroup = document.getElementById('input-sub2api-group');
 const selectMailProvider = document.getElementById('select-mail-provider');
+const rowEmailGenerator = document.getElementById('row-email-generator');
 const selectEmailGenerator = document.getElementById('select-email-generator');
 const hotmailSection = document.getElementById('hotmail-section');
 const inputHotmailEmail = document.getElementById('input-hotmail-email');
@@ -921,6 +922,21 @@ function getCurrentHotmailAccount(state = latestState) {
   return getHotmailAccounts(state).find((account) => account.id === currentId) || null;
 }
 
+function getCurrentHotmailEmail(state = latestState) {
+  return String(getCurrentHotmailAccount(state)?.email || '').trim();
+}
+
+function isCurrentEmailManagedByHotmail(state = latestState) {
+  const hotmailEmail = getCurrentHotmailEmail(state);
+  if (!hotmailEmail) {
+    return false;
+  }
+
+  const inputEmailValue = String(inputEmail.value || '').trim();
+  const stateEmailValue = String(state?.email || '').trim();
+  return inputEmailValue === hotmailEmail || stateEmailValue === hotmailEmail;
+}
+
 function getHotmailAccountsByUsage(mode = 'all', state = latestState) {
   const accounts = getHotmailAccounts(state);
   if (typeof filterHotmailAccountsByUsage === 'function') {
@@ -1015,8 +1031,7 @@ function upsertHotmailAccountListLocally(accounts, nextAccount) {
 function refreshHotmailSelectionUI() {
   renderHotmailAccounts();
   if (selectMailProvider.value === 'hotmail-api') {
-    const currentAccount = getCurrentHotmailAccount();
-    inputEmail.value = currentAccount?.email || latestState?.email || '';
+    inputEmail.value = getCurrentHotmailEmail();
   }
 }
 
@@ -1129,12 +1144,17 @@ function renderHotmailAccounts() {
 function updateMailProviderUI() {
   const useInbucket = selectMailProvider.value === 'inbucket';
   const useHotmail = selectMailProvider.value === 'hotmail-api';
+  const useEmailGenerator = !useHotmail;
   rowInbucketHost.style.display = useInbucket ? '' : 'none';
   rowInbucketMailbox.style.display = useInbucket ? '' : 'none';
   const useCloudflare = selectEmailGenerator.value === 'cloudflare';
-  rowCfDomain.style.display = !useHotmail && useCloudflare ? '' : 'none';
+  const showCloudflareDomain = useEmailGenerator && useCloudflare;
+  if (rowEmailGenerator) {
+    rowEmailGenerator.style.display = useEmailGenerator ? '' : 'none';
+  }
+  rowCfDomain.style.display = showCloudflareDomain ? '' : 'none';
   const { domains } = getCloudflareDomainsFromState();
-  if (useCloudflare) {
+  if (showCloudflareDomain) {
     setCloudflareDomainEditMode(cloudflareDomainEditMode || domains.length === 0, { clearInput: false });
   } else {
     setCloudflareDomainEditMode(false, { clearInput: false });
@@ -1157,8 +1177,7 @@ function updateMailProviderUI() {
       : '先自动获取邮箱，或手动粘贴邮箱后再继续';
   }
   if (useHotmail) {
-    const currentAccount = getCurrentHotmailAccount();
-    inputEmail.value = currentAccount?.email || latestState?.email || '';
+    inputEmail.value = getCurrentHotmailEmail();
   }
   renderHotmailAccounts();
 }
@@ -2190,8 +2209,13 @@ inputPassword.addEventListener('blur', () => {
   saveSettings({ silent: true }).catch(() => { });
 });
 
-selectMailProvider.addEventListener('change', () => {
+selectMailProvider.addEventListener('change', async () => {
+  const previousProvider = latestState?.mailProvider || '';
+  const nextProvider = selectMailProvider.value;
   updateMailProviderUI();
+  if (previousProvider === 'hotmail-api' && nextProvider !== 'hotmail-api' && isCurrentEmailManagedByHotmail()) {
+    await clearRegistrationEmail({ silent: true }).catch(() => { });
+  }
   markSettingsDirty(true);
   saveSettings({ silent: true }).catch(() => { });
 });
@@ -2400,8 +2424,7 @@ chrome.runtime.onMessage.addListener((message) => {
       if (message.payload.currentHotmailAccountId !== undefined || message.payload.hotmailAccounts !== undefined) {
         renderHotmailAccounts();
         if (selectMailProvider.value === 'hotmail-api') {
-          const currentAccount = getCurrentHotmailAccount();
-          inputEmail.value = currentAccount?.email || latestState?.email || '';
+          inputEmail.value = getCurrentHotmailEmail();
         }
       }
       if (message.payload.autoRunDelayEnabled !== undefined) {