diff --git a/Essentials/src/com/earth2me/essentials/UserMap.java b/Essentials/src/com/earth2me/essentials/UserMap.java
index a24e35a03..a615f753f 100644
--- a/Essentials/src/com/earth2me/essentials/UserMap.java
+++ b/Essentials/src/com/earth2me/essentials/UserMap.java
@@ -145,7 +145,7 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
 			if (name != null && name.length() > 0)
 			{
 				final String keyName = StringUtil.sanitizeFileName(name);
-				if (!names.containsKey(keyName))
+				if (!names.containsKey(keyName) || !names.get(keyName).equals(uuid))
 				{
 					names.put(keyName, uuid);
 					uuidMap.writeUUIDMap();