diff --git a/Mage/src/main/java/mage/game/permanent/token/Token.java b/Mage/src/main/java/mage/game/permanent/token/Token.java
index d42315cb39..5ece2ed7a2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/Token.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Token.java
@@ -230,7 +230,7 @@ public class Token extends MageObjectImpl {
                     game.getCombat().addAttackingCreature(permanent.getId(), game, attackedPlayer);
                 }
                 if (!game.isSimulation()) {
-                    game.informPlayers(controller.getLogName() + " puts a " + permanent.getLogName() + " token");
+                    game.informPlayers(controller.getLogName() + " creates a " + permanent.getLogName() + " token");
                 }
 
             }
@@ -287,9 +287,11 @@ public class Token extends MageObjectImpl {
             if (availableImageSetCodes.contains(code)) {
                 setOriginalExpansionSetCode(code);
             } else // we should not set random set if appropriate set is already used
-            if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()
-                    || !availableImageSetCodes.contains(getOriginalExpansionSetCode())) {
-                setOriginalExpansionSetCode(availableImageSetCodes.get(RandomUtil.nextInt(availableImageSetCodes.size())));
+            {
+                if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()
+                        || !availableImageSetCodes.contains(getOriginalExpansionSetCode())) {
+                    setOriginalExpansionSetCode(availableImageSetCodes.get(RandomUtil.nextInt(availableImageSetCodes.size())));
+                }
             }
         } else if (getOriginalExpansionSetCode() == null || getOriginalExpansionSetCode().isEmpty()) {
             setOriginalExpansionSetCode(code);