diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index 04a523b..7105e02 100644
--- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -2319,7 +2319,11 @@ public class GriefPrevention extends JavaPlugin
         //limit memory footprint
         if(GriefPrevention.uuidToNameMap.size() >= 500) GriefPrevention.uuidToNameMap.clear();
         
-        GriefPrevention.uuidToNameMap.put(playerID, playerName);        
+        GriefPrevention.uuidToNameMap.put(playerID, playerName);  
+        
+        //always store the reverse mapping
+        GriefPrevention.instance.playerNameToIDMap.put(playerName, playerID);
+        GriefPrevention.instance.playerNameToIDMap.put(playerName.toLowerCase(), playerID);
     }
 
     //string overload for above helper
diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
index f713bb7..27bf75a 100644
--- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
@@ -587,10 +587,6 @@ class PlayerEventHandler implements Listener
 		
 		//in case player has changed his name, on successful login, update UUID > Name mapping
 		GriefPrevention.cacheUUIDNamePair(player.getUniqueId(), player.getName());
-		
-		//also cache the reverse mapping
-		GriefPrevention.instance.playerNameToIDMap.put(player.getName(), playerID);
-		GriefPrevention.instance.playerNameToIDMap.put(player.getName().toLowerCase(), playerID);
 	}
 	
 	//when a player spawns, conditionally apply temporary pvp protection