diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java b/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java
index e1d3919f7..9b11fcb68 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java
@@ -1,8 +1,10 @@
 package main.java.com.djrapitops.plan.systems.cache;
 
+import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.database.Database;
 
+import java.sql.SQLException;
 import java.util.*;
 
 /**
@@ -52,7 +54,17 @@ public class DataCache extends SessionCache {
     }
 
     public String getDisplayName(UUID uuid) {
-        return displayNames.get(uuid);
+        String cached = displayNames.get(uuid);
+        if (cached == null) {
+            List<String> nicknames = null;
+            try {
+                nicknames = db.getNicknamesTable().getNicknames(uuid);
+                return nicknames.get(nicknames.size() - 1);
+            } catch (SQLException e) {
+                Log.toLog(this.getClass().getName(), e);
+            }
+        }
+        return cached;
     }
 
     public void addFirstLeaveCheck(UUID uuid) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.java
index f3ee72d25..6d60c21b5 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.java
@@ -40,6 +40,8 @@ public class NameProcessor extends PlayerProcessor {
             return;
         }
 
+
+
         Database db = plugin.getDB();
         try {
             db.getUsersTable().updateName(uuid, playerName);
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java
index 76de5eece..5de269d55 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.java
@@ -41,7 +41,7 @@ public class RegisterProcessor extends PlayerProcessor {
         }
         plugin.getDataCache().addFirstLeaveCheck(uuid);
         try {
-            db.getUsersTable().registerUser(uuid, time, name);
+            db.getUserInfoTable().registerUserInfo(uuid, time);
             db.getActionsTable().insertAction(uuid, new Action(time, Actions.REGISTERED, "Online: " + playersOnline + " Players"));
         } catch (SQLException e) {
             Log.toLog(this.getClass().getName(), e);