diff --git a/.gitattributes b/.gitattributes
index c09ee0eacde..76699f7e225 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2277,6 +2277,7 @@ res/cardsfolder/d/dragon_mage.txt svneol=native#text/plain
 res/cardsfolder/d/dragon_mask.txt -text
 res/cardsfolder/d/dragon_roost.txt svneol=native#text/plain
 res/cardsfolder/d/dragon_scales.txt -text
+res/cardsfolder/d/dragon_shadow.txt -text
 res/cardsfolder/d/dragon_tyrant.txt svneol=native#text/plain
 res/cardsfolder/d/dragon_whelp.txt svneol=native#text/plain
 res/cardsfolder/d/dragon_wings.txt -text
diff --git a/res/cardsfolder/d/dragon_breath.txt b/res/cardsfolder/d/dragon_breath.txt
index de8714b11bd..47fd2124405 100644
--- a/res/cardsfolder/d/dragon_breath.txt
+++ b/res/cardsfolder/d/dragon_breath.txt
@@ -6,9 +6,8 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Haste | Description$ Enchanted creature has haste.
 A:AB$ Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | OptionalDecider$ You | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ TriggeredCard
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_breath.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/86.jpg
diff --git a/res/cardsfolder/d/dragon_fangs.txt b/res/cardsfolder/d/dragon_fangs.txt
index 7c5dbafdd90..8cd93d39e66 100644
--- a/res/cardsfolder/d/dragon_fangs.txt
+++ b/res/cardsfolder/d/dragon_fangs.txt
@@ -5,9 +5,8 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Trample | Description$ Enchanted creature gets +1/+1 and has trample.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | OptionalDecider$ You | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ TriggeredCard
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_fangs.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/117.jpg
diff --git a/res/cardsfolder/d/dragon_scales.txt b/res/cardsfolder/d/dragon_scales.txt
index 2b07560353e..a882eab6664 100644
--- a/res/cardsfolder/d/dragon_scales.txt
+++ b/res/cardsfolder/d/dragon_scales.txt
@@ -5,9 +5,8 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +1/+2 and has vigilance.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | OptionalDecider$ You | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ TriggeredCard
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_scales.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/10.jpg
diff --git a/res/cardsfolder/d/dragon_shadow.txt b/res/cardsfolder/d/dragon_shadow.txt
new file mode 100644
index 00000000000..bad297e7558
--- /dev/null
+++ b/res/cardsfolder/d/dragon_shadow.txt
@@ -0,0 +1,14 @@
+Name:Dragon Shadow
+ManaCost:1 B
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddKeyword$ Fear | Description$ Enchanted creature gets +1/+0 and has fear. (It can't be blocked except by artifact creatures and/or black creatures.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | OptionalDecider$ You | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
+SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ TriggeredCard
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_shadow.jpg
+SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/65.jpg
+Oracle:Enchant creature\nEnchanted creature gets +1/+0 and has fear. (It can't be blocked except by artifact creatures and/or black creatures.)\nWhen a creature with converted mana cost 6 or greater enters the battlefield, you may return Dragon Shadow from your graveyard to the battlefield attached to that creature.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/d/dragon_wings.txt b/res/cardsfolder/d/dragon_wings.txt
index d7b8ee08779..04c590823d2 100644
--- a/res/cardsfolder/d/dragon_wings.txt
+++ b/res/cardsfolder/d/dragon_wings.txt
@@ -6,9 +6,8 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
 K:Cycling:1 U
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE6 | Execute$ TrigReturn | TriggerZones$ Graveyard | OptionalDecider$ You | TriggerDescription$ When a creature with converted mana cost 6 or greater enters the battlefield, you may return CARDNAME from your graveyard to the battlefield attached to that creature.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ TriggeredCard
-SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_wings.jpg
 SetInfo:SCG|Common|http://magiccards.info/scans/en/sc/34.jpg
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
index 25f23ccf6c1..6dc498eedbc 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
@@ -1614,13 +1614,23 @@ public final class AbilityFactoryChangeZone {
      */
     private static boolean changeKnownOriginTriggerAI(final AbilityFactory af, final SpellAbility sa,
             final boolean mandatory) {
+        final HashMap<String, String> params = af.getMapParams();
         if (!ComputerUtil.canPayCost(sa)) {
             return false;
         }
 
         if (sa.getTarget() == null) {
             // Just in case of Defined cases
-            // do nothing
+            if (!mandatory && params.containsKey("AttachedTo")) {
+                ArrayList<Card> list = AbilityFactory.getDefinedCards(sa.getSourceCard(), params.get("AttachedTo"), sa);
+                if (!list.isEmpty()) {
+                    Card attachedTo = list.get(0);
+                    // This code is for the Dragon auras
+                    if (attachedTo.getController().isHuman()) {
+                        return false;
+                    }
+                }
+            }
         } else if (AbilityFactoryChangeZone.changeKnownPreferredTarget(af, sa, mandatory)) {
             // do nothing
         } else if (!AbilityFactoryChangeZone.changeKnownUnpreferredTarget(af, sa, mandatory)) {
@@ -1778,7 +1788,7 @@ public final class AbilityFactoryChangeZone {
         final HashMap<String, String> params = af.getMapParams();
         final Target tgt = sa.getTarget();
         final Player player = sa.getActivatingPlayer();
-        final Card hostCard = af.getHostCard();
+        final Card hostCard = sa.getSourceCard();
 
         final Zone destination = Zone.valueOf(params.get("Destination"));
         final Zone origin = Zone.valueOf(params.get("Origin"));