diff --git a/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java b/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java
index 2976b83..6326403 100644
--- a/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java
+++ b/src/main/java/com/lishid/openinv/internal/v1_7_R3/PlayerDataManager.java
@@ -72,6 +72,10 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     private static UUID matchUser(String search) {
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(search);
+        if (offlinePlayer != null && offlinePlayer.hasPlayedBefore()) {
+            return offlinePlayer.getUniqueId();
+        }
         UUID found = null;
 
         String lowerSearch = search.toLowerCase();
diff --git a/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java b/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java
index 8cadf56..9273d63 100644
--- a/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java
+++ b/src/main/java/com/lishid/openinv/internal/v1_7_R4/PlayerDataManager.java
@@ -72,6 +72,10 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     private static UUID matchUser(String search) {
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(search);
+        if (offlinePlayer != null && offlinePlayer.hasPlayedBefore()) {
+            return offlinePlayer.getUniqueId();
+        }
         UUID found = null;
 
         String lowerSearch = search.toLowerCase();
diff --git a/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java b/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java
index 90dca7f..6716cf1 100644
--- a/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java
+++ b/src/main/java/com/lishid/openinv/internal/v1_8_R1/PlayerDataManager.java
@@ -65,6 +65,10 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     private static UUID matchUser(String search) {
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(search);
+        if (offlinePlayer != null && offlinePlayer.hasPlayedBefore()) {
+            return offlinePlayer.getUniqueId();
+        }
         UUID found = null;
 
         String lowerSearch = search.toLowerCase();
diff --git a/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java b/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java
index c03ed13..6e0eb5a 100644
--- a/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java
+++ b/src/main/java/com/lishid/openinv/internal/v1_8_R2/PlayerDataManager.java
@@ -65,6 +65,10 @@ public class PlayerDataManager implements IPlayerDataManager {
     }
 
     private static UUID matchUser(String search) {
+        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(search);
+        if (offlinePlayer != null && offlinePlayer.hasPlayedBefore()) {
+            return offlinePlayer.getUniqueId();
+        }
         UUID found = null;
 
         String lowerSearch = search.toLowerCase();