diff --git a/options/mzta-options.html b/options/mzta-options.html
index aac0b1c2..bdc5ac42 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -276,24 +276,6 @@
           </label>
         </td>
       </tr>
-      <tr class="add_tags_tr">
-        <td><span>__MSG_prefs_OptionText_add_tags_maxnum__</span></td>
-        <td>
-          <label>
-            <input type="number" id="add_tags_maxnum" name="add_tags_maxnum" class="option-input" />
-            <br>__MSG_prefs_OptionText_add_tags_maxnum_Info__
-          </label>
-        </td>
-      </tr>
-      <tr class="add_tags_tr">
-        <td><span>__MSG_prefs_OptionText_add_tags_hide_exclusions__</span></td>
-        <td>
-          <label>
-            <input type="checkbox" id="add_tags_hide_exclusions" name="add_tags_hide_exclusions" class="option-input" />
-            __MSG_prefs_OptionText_add_tags_hide_exclusions_Info__
-          </label>
-        </td>
-      </tr>
       <tr>
         <td style="width:20em"><label>
           <span>__MSG_Debug__</span>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index 368ba30d..215f2726 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -215,15 +215,8 @@ function disable_MaxPromptLength(){
 
 function disable_AddTags(){
   let add_tags = document.getElementById('add_tags');
-  let add_tags_maxnum = document.getElementById('add_tags_maxnum');
-  let conntype_select = document.getElementById("connection_type");
-  add_tags.disabled = (conntype_select.value === "chatgpt_web");
-  add_tags_maxnum.disabled = (conntype_select.value === "chatgpt_web");
 
-  // Seleziona tutti gli elementi con la classe 'add_tags_tr'
   let add_tags_tr_elements = document.querySelectorAll('.add_tags_tr');
-
-  // Applica lo stile a tutti gli elementi con la classe
   add_tags_tr_elements.forEach(add_tags_tr => {
     add_tags_tr.style.display = (add_tags.disabled) ? 'none' : 'table-row';
   });
diff --git a/pages/addtags/mzta-add-tags.css b/pages/addtags/mzta-add-tags.css
index 193e72fe..f59ce8a9 100644
--- a/pages/addtags/mzta-add-tags.css
+++ b/pages/addtags/mzta-add-tags.css
@@ -31,6 +31,34 @@
     display: none;
 }
 
+table#miczPrefs {
+    padding: 10px;
+    border-spacing: 0px;
+    width: 90%;
+    margin: 0px auto 40px auto;
+    border: 1px solid #ccc;
+}
+
+.addtags_table_title{
+    width: 90%;
+    margin: auto;
+}
+
+table#miczPrefs td{
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    vertical-align: top;
+    padding: 2px;
+}
+
+table#miczPrefs tr:first-child td {
+    border-top: none;
+}
+  
+table#miczPrefs  tr:last-child td {
+    border-bottom: none;
+}
+
 .autocomplete-container {
     position: relative;
 }
diff --git a/pages/addtags/mzta-add-tags.html b/pages/addtags/mzta-add-tags.html
index 2c59c89a..bf680236 100644
--- a/pages/addtags/mzta-add-tags.html
+++ b/pages/addtags/mzta-add-tags.html
@@ -11,6 +11,27 @@
         <h1 class="page_title">__MSG_AddTags_PageTitle__</h1>
         <p>__MSG_AddTags_info_default__</p>
     </div>
+    <div class="addtags_table_title">__MSG_AddTags_prompt_text_title__</div>
+    <table id="miczPrefs">
+          <tr class="add_tags_tr">
+            <td><span>__MSG_prefs_OptionText_add_tags_maxnum__</span></td>
+            <td>
+              <label>
+                <input type="number" id="add_tags_maxnum" name="add_tags_maxnum" class="option-input" />
+                <br>__MSG_prefs_OptionText_add_tags_maxnum_Info__
+              </label>
+            </td>
+          </tr>
+          <tr class="add_tags_tr">
+            <td><span>__MSG_prefs_OptionText_add_tags_hide_exclusions__</span></td>
+            <td>
+              <label>
+                <input type="checkbox" id="add_tags_hide_exclusions" name="add_tags_hide_exclusions" class="option-input" />
+                __MSG_prefs_OptionText_add_tags_hide_exclusions_Info__
+              </label>
+            </td>
+          </tr>
+    </table>
     <div id="addtags_prompt_container">
         __MSG_AddTags_prompt_text_title__<span id="addtags_prompt_unsaved" class="unsaved hidden"> __MSG_customPrompts_unsaved_changes__</span>
         <br><span class="infoline">__MSG_prefs_OptionText_btnManagePrompts_infoline__ <a href="https://micz.it/thunderbird-addon-thunderai/data-placeholders/">__MSG_customPrompts_managePrompts_help__</a></span>
diff --git a/pages/addtags/mzta-add-tags.js b/pages/addtags/mzta-add-tags.js
index 013f9f72..79f1edef 100644
--- a/pages/addtags/mzta-add-tags.js
+++ b/pages/addtags/mzta-add-tags.js
@@ -16,16 +16,25 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { prefs_default } from '../../options/mzta-options-default.js';
+import { taLogger } from '../../js/mzta-logger.js';
 import { getSpecialPrompts, setSpecialPrompts } from "../../js/mzta-prompts.js";
 import { getPlaceholders } from "../../js/mzta-placeholders.js";
 import { textareaAutocomplete } from "../../js/mzta-placeholders-autocomplete.js";
 import { addTags_getExclusionList, addTags_setExclusionList } from "../../js/mzta-addatags-exclusion-list.js";
 
+
 let autocompleteSuggestions = [];
+let taLog = new taLogger("mzta-addtags-page",true);
 
 document.addEventListener('DOMContentLoaded', async () => {
 
     i18n.updateDocument();
+    await restoreOptions();
+
+    document.querySelectorAll(".option-input").forEach(element => {
+        element.addEventListener("change", saveOptions);
+      });
 
     let addtags_textarea = document.getElementById('addtags_prompt_text');
     let addtags_save_btn = document.getElementById('btn_save_prompt');
@@ -101,4 +110,75 @@ document.addEventListener('DOMContentLoaded', async () => {
         document.getElementById('excl_list_unsaved').classList.add('hidden');
     });
 
-});
\ No newline at end of file
+});
+
+
+
+// Methods to manage options, derived from: /options/mzta-options.js
+
+function saveOptions(e) {
+  e.preventDefault();
+  let options = {};
+  let element = e.target;
+
+    switch (element.type) {
+      case 'checkbox':
+        options[element.id] = element.checked;
+        break;
+      case 'number':
+        options[element.id] = element.valueAsNumber;
+        break;
+        case 'text':
+        case 'password':
+        options[element.id] = element.value.trim();
+        break;
+      default:
+        if (element.tagName === 'SELECT') {
+          options[element.id] = element.value;
+        }else{
+          console.error("[ThunderAI] Unhandled input type:", element.type);
+        }
+    }
+
+  browser.storage.sync.set(options);
+}
+
+async function restoreOptions() {
+  function setCurrentChoice(result) {
+    document.querySelectorAll(".option-input").forEach(element => {
+      taLog.log("Options restoring " + element.id + " = " + (element.id=="chatgpt_api_key" || element.id=="openai_comp_api_key" ? "****************" : result[element.id]));
+      switch (element.type) {
+        case 'checkbox':
+          element.checked = result[element.id] || false;
+          break;
+        case 'number':
+          let default_number_value = 0;
+          if(element.id == 'chatgpt_win_height') default_number_value = prefs_default.chatgpt_win_height;
+          if(element.id == 'chatgpt_win_width') default_number_value = prefs_default.chatgpt_win_width;
+          element.value = result[element.id] ?? default_number_value;
+          break;
+        case 'text':
+        case 'password':
+          let default_text_value = '';
+          if(element.id == 'default_chatgpt_lang') default_text_value = prefs_default.default_chatgpt_lang;
+          element.value = result[element.id] || default_text_value;
+          break;
+        default:
+        if (element.tagName === 'SELECT') {
+          let default_select_value = '';
+          if(element.id == 'reply_type') default_select_value = 'reply_all';
+          if(element.id == 'connection_type') default_select_value = 'chatgpt_web';
+          element.value = result[element.id] || default_select_value;
+          if (element.value === '') {
+            element.selectedIndex = -1;
+          }
+        }else{
+          console.error("[ThunderAI] Unhandled input type:", element.type);
+        }
+      }
+    });
+  }
+
+  let getting = await browser.storage.sync.get(prefs_default);
+  setCurrentChoice(getting);
+}
\ No newline at end of file