diff --git a/data/conf/rspamd/dynmaps/settings.php b/data/conf/rspamd/dynmaps/settings.php
index 3f358c1df..0569db90a 100644
--- a/data/conf/rspamd/dynmaps/settings.php
+++ b/data/conf/rspamd/dynmaps/settings.php
@@ -394,13 +394,8 @@ while ($row = array_shift($rows)) {
 */
 
 ?>
-  traps {
+  ham_trap {
 <?php
-  foreach (ucl_rcpts('spam@localhost', 'mailbox') as $rcpt) {
-?>
-    rcpt = <?=json_encode($rcpt, JSON_UNESCAPED_SLASHES);?>;
-<?php
-  }
   foreach (ucl_rcpts('ham@localhost', 'mailbox') as $rcpt) {
 ?>
     rcpt = <?=json_encode($rcpt, JSON_UNESCAPED_SLASHES);?>;
@@ -408,7 +403,29 @@ while ($row = array_shift($rows)) {
   }
 ?>
     priority = 9;
-    want_spam = yes;
+    apply "default" {
+      symbols_enabled = ["HISTORY_SAVE"];
+    }
+    symbols [
+      "HAM_TRAP"
+    ]
+  }
+
+  spam_trap {
+<?php
+  foreach (ucl_rcpts('spam@localhost', 'mailbox') as $rcpt) {
+?>
+    rcpt = <?=json_encode($rcpt, JSON_UNESCAPED_SLASHES);?>;
+<?php
+  }
+?>
+    priority = 9;
+    apply "default" {
+      symbols_enabled = ["HISTORY_SAVE"];
+    }
+    symbols [
+      "SPAM_TRAP"
+    ]
   }
 <?php
 // Start additional content
diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua
index 6e7c7115e..44242486b 100644
--- a/data/conf/rspamd/lua/rspamd.local.lua
+++ b/data/conf/rspamd/lua/rspamd.local.lua
@@ -113,9 +113,9 @@ rspamd_config:register_symbol({
     for _,fr in ipairs(from) do
       local fr_split = rspamd_str_split(fr['addr'], '@')
       if #fr_split == 2 then
-        if fr_split[1] == 'postmaster' then
+        if fr_split[1] == 'postmaster' and task:get_user() then
           -- no whitelist, keep signatures
-          task:insert_result(true, 'POSTMASTER_FROM', -2500.0, from_ip_string)
+          task:insert_result(true, 'POSTMASTER_FROM', -2500.0)
           return
         end
       end