diff --git a/data/conf/rspamd/dynmaps/tags.php b/data/conf/rspamd/dynmaps/tags.php
index cc6435fe..a084d141 100644
--- a/data/conf/rspamd/dynmaps/tags.php
+++ b/data/conf/rspamd/dynmaps/tags.php
@@ -14,4 +14,9 @@ $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 while ($row = array_shift($rows)) {
   echo strtolower(trim($row['username'])) . PHP_EOL;
 }
-?>
\ No newline at end of file
+$stmt = $pdo->query("SELECT CONCAT(mailbox.local_part, '@', alias_domain.alias_domain) as `tag_ad` FROM `mailbox` INNER JOIN `alias_domain` ON mailbox.domain = alias_domain.target_domain WHERE mailbox.wants_tagged_subject='1';");
+$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
+while ($row = array_shift($rows)) {
+  echo strtolower(trim($row['tag_ad'])) . PHP_EOL;
+}
+?>
diff --git a/data/web/admin.php b/data/web/admin.php
index f0c11f60..24c064b3 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -48,7 +48,7 @@ $tfa_data = get_tfa();
               <div id="tfa_additional">
                 <?php if($tfa_data['additional']):
                 foreach ($tfa_data['additional'] as $key_info): ?>
-                <form method="post">
+                <form style="display:inline;" method="post">
                   <input type="hidden" name="unset_tfa_key" value="<?=$key_info['id'];?>" />
                   <div class="label label-default">🔑 <?=$key_info['key_id'];?> <a href="#" style="font-weight:bold;color:white" onClick="$(this).closest('form').submit()">[<?=strtolower($lang['admin']['remove']);?>]</a></div>
                 </form>
diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index 913f8924..359c4119 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -1912,7 +1912,7 @@ function unset_tfa_key($postarray) {
   // Needs at least one key left
   global $pdo;
   global $lang;
-  $id = intval($postarray['id']);
+  $id = intval($postarray['unset_tfa_key']);
   if ($_SESSION['mailcow_cc_role'] != "domainadmin" &&
     $_SESSION['mailcow_cc_role'] != "admin") {
       $_SESSION['return'] = array(
diff --git a/data/web/user.php b/data/web/user.php
index fe3ecf36..253715b6 100644
--- a/data/web/user.php
+++ b/data/web/user.php
@@ -29,7 +29,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'doma
             <div id="tfa_additional">
               <?php if($tfa_data['additional']):
               foreach ($tfa_data['additional'] as $key_info): ?>
-              <form method="post">
+                <form style="display:inline;" method="post">
                 <input type="hidden" name="unset_tfa_key" value="<?=$key_info['id'];?>" />
                 <div class="label label-default">🔑 <?=$key_info['key_id'];?> <a href="#" style="font-weight:bold;color:white" onClick="$(this).closest('form').submit()">[<?=strtolower($lang['admin']['remove']);?>]</a></div>
               </form>