diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index baf46b004..50a947da7 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -229,4 +229,5 @@ v2.1:
 	- Add UUID support.
 	  Plugins can still query by player name but a UUID is faster and preferable.
 	- Set a default mirror map if none is found in the config.
-	- Fix clones forgetting sub groups.
\ No newline at end of file
+	- Fix clones forgetting sub groups.
+	- Prevent players who have never logged in before from taking over existing accounts.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 14a9a052d..a6312ae70 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -155,7 +155,7 @@ public class WorldDataHolder {
 		// Search for a LastName match
 		for (User usr : getUserList()) {
 			
-			if (usr.getLastName().equalsIgnoreCase(currentName)) {
+			if (usr.getLastName().equalsIgnoreCase(currentName) && !usr.getUUID().equalsIgnoreCase(usr.getLastName())) {
 				
 				// Clone this user so we can set it's uUID
 				user = usr.clone(uUID, currentName);