diff --git a/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java b/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
index a32abfd..a537936 100644
--- a/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
+++ b/src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
@@ -40,6 +40,13 @@ public class NameManager {
             return lastSeenName.get(uuid);
         }
 
+        if (Bukkit.getOfflinePlayer(uuid).getName() != null) {
+            String lastSeen = Bukkit.getOfflinePlayer(uuid).getName();
+
+            lastSeenName.put(uuid, lastSeen);
+            return lastSeen;
+        }
+
         Account account = null;
 
         try {
@@ -214,6 +221,10 @@ public class NameManager {
     public static boolean canUseName(Player player, String name) {
         String shortenedName = NameUtil.stripUsername(getUsername(player.getUniqueId()));
 
+        if (ChestShopSign.isAdminShop(name)) {
+            return false;
+        }
+
         return shortenedName.equals(name) || Permission.otherName(player, name) || player.getUniqueId().equals(getUUID(name));
     }