diff --git a/Mage/src/mage/game/permanent/token/Token.java b/Mage/src/mage/game/permanent/token/Token.java
index 743e1459f6c..63ba63057e5 100644
--- a/Mage/src/mage/game/permanent/token/Token.java
+++ b/Mage/src/mage/game/permanent/token/Token.java
@@ -88,6 +88,9 @@ public class Token extends MageObjectImpl<Token> {
         super(token);
         this.description = token.description;
         this.tokenType = token.tokenType;
+        this.lastAddedTokenId = token.lastAddedTokenId;
+        this.originalCardNumber =  token.originalCardNumber;
+        this.originalExpansionSetCode = token.originalExpansionSetCode;
     }
 
     public String getDescription() {
diff --git a/Mage/src/mage/util/functions/CopyTokenFunction.java b/Mage/src/mage/util/functions/CopyTokenFunction.java
index b83582c791e..d21c805458a 100644
--- a/Mage/src/mage/util/functions/CopyTokenFunction.java
+++ b/Mage/src/mage/util/functions/CopyTokenFunction.java
@@ -59,8 +59,13 @@ public class CopyTokenFunction implements Function<Token, Card> {
         MageObject sourceObj = source;
         if (source instanceof PermanentToken) {
             sourceObj = ((PermanentToken) source).getToken();
+            // to show the source image, the original values have to be used
+            target.setOriginalExpansionSetCode(((Token)sourceObj).getOriginalExpansionSetCode());
+            target.setOriginalCardNumber(((Token)sourceObj).getOriginalCardNumber());
         } else if (source instanceof PermanentCard) {
             sourceObj = ((PermanentCard) source).getCard();
+            target.setOriginalExpansionSetCode(source.getExpansionSetCode());
+            target.setOriginalCardNumber(source.getCardNumber());
         }
 
         target.setName(sourceObj.getName());
@@ -79,8 +84,7 @@ public class CopyTokenFunction implements Function<Token, Card> {
         for (String type : sourceObj.getSupertype()) {
             target.getSupertype().add(type);
         }
-        target.setOriginalExpansionSetCode(source.getExpansionSetCode());
-        target.setOriginalCardNumber(source.getCardNumber());
+
         target.getAbilities().clear();
 
         for (Ability ability0 : sourceObj.getAbilities()) {