diff --git a/src/com/massivecraft/mcore/MCoreMPlayer.java b/src/com/massivecraft/mcore/MCoreMPlayer.java
index eb4d875c..1e89bef3 100644
--- a/src/com/massivecraft/mcore/MCoreMPlayer.java
+++ b/src/com/massivecraft/mcore/MCoreMPlayer.java
@@ -44,6 +44,12 @@ public class MCoreMPlayer extends Entity<MCoreMPlayer>
 	
 	private String name = null;
 	public String getName() { return this.name; }
-	public void setName(String name) { this.name = name; this.changed(); }
+	public void setName(String name)
+	{
+		this.name = name;
+		if (!this.attached()) return;
+		MCoreMPlayerColl.get().getIndexName().update(this, name);
+		this.changed();
+	}
 	
 }