diff --git a/src/main/java/com/Acrobot/ChestShop/Events/PreShopCreationEvent.java b/src/main/java/com/Acrobot/ChestShop/Events/PreShopCreationEvent.java
index 8cb9e0cfe..7e32f2b30 100644
--- a/src/main/java/com/Acrobot/ChestShop/Events/PreShopCreationEvent.java
+++ b/src/main/java/com/Acrobot/ChestShop/Events/PreShopCreationEvent.java
@@ -6,6 +6,8 @@
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 
+import com.Acrobot.Breeze.Utils.MaterialUtil;
+
 /**
  * Represents a state before shop is created
  *
@@ -28,6 +30,8 @@ public PreShopCreationEvent(Player creator, Sign sign, String[] signLines, ItemS
         this.itemStack = itemStack;
         if (itemStack == null)
             outcome = CreationOutcome.INVALID_ITEM;
+        else
+            this.signLines[3] = MaterialUtil.getName(itemStack.getType());
     }
 
     public String getQuantityLine() {
diff --git a/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java b/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
index 2f3b43030..76147f6ad 100644
--- a/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
+++ b/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
@@ -39,7 +39,7 @@ public class NameManager {
     private static UUID serverAccountUUID;
 
     public static String getNameFor(Player player) {
-        return currentShortName.get(player.getUniqueId());
+        return player.getDisplayName();
     }
 
     public static UUID getUUIDForFullName(String name) {