diff --git a/forge-gui/res/cardsfolder/c/curse_of_disturbance.txt b/forge-gui/res/cardsfolder/c/curse_of_disturbance.txt
index 4052cafa852..1c288c1bffe 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_disturbance.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_disturbance.txt
@@ -4,5 +4,6 @@ Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | ValidTgts$ Player | AILogic$ Curse
 T:Mode$ AttackersDeclared | ValidCard$ Creature | AttackedTarget$ Player.EnchantedBy | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is attacked, create a 2/2 black Zombie creature token. Each opponent attacking that player does the same.
-SVar:TrigToken:DB$ Token | TokenOwner$ TriggeredAttackingPlayer=OpponentAndYou | TokenScript$ b_2_2_zombie
+SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenOwner$ TriggeredAttackingPlayer=Opponent | TokenScript$ b_2_2_zombie
 Oracle:Enchant player\nWhenever enchanted player is attacked, create a 2/2 black Zombie creature token. Each opponent attacking that player does the same.
diff --git a/forge-gui/res/cardsfolder/c/curse_of_opulence.txt b/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
index b5f2d0d936b..5dc33b97fa8 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
@@ -4,5 +4,6 @@ Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | ValidTgts$ Player | AILogic$ Curse
 T:Mode$ AttackersDeclared | ValidCard$ Creature | AttackedTarget$ Player.EnchantedBy | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is attacked, create a Gold token. Each opponent attacking that player does the same. (A Gold token is an artifact with "Sacrifice this artifact: Add one mana of any color.")
-SVar:TrigToken:DB$ Token | TokenScript$ c_a_gold_draw | TokenOwner$ TriggeredAttackingPlayer=OpponentAndYou
+SVar:TrigToken:DB$ Token | TokenScript$ c_a_gold_draw | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenOwner$ TriggeredAttackingPlayer=Opponent | TokenScript$ c_a_gold_draw
 Oracle:Enchant player\nWhenever enchanted player is attacked, create a Gold token. Each opponent attacking that player does the same. (A Gold token is an artifact with "Sacrifice this artifact: Add one mana of any color.")