diff --git a/.gitignore b/.gitignore
index f594a93a3..26d37a6ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,6 @@
 .idea/
 *.iml
 target/
-dependency-reduced-pom.xml
\ No newline at end of file
+dependency-reduced-pom.xml
+/Essentials/config.yml
+/Essentials/userdata/testplayer1.yml
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 5eccfb172..6db22c0fa 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -230,6 +230,7 @@ public class EssentialsPlayerListener implements Listener
 					return;
 				}
 
+				user.trackUUID();
 				user.setLastLogin(currentTime);
 				user.setDisplayNick();
 				updateCompass(user);
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java
index a2787972f..10df8de57 100644
--- a/Essentials/src/com/earth2me/essentials/UserData.java
+++ b/Essentials/src/com/earth2me/essentials/UserData.java
@@ -870,6 +870,12 @@ public abstract class UserData extends PlayerExtension implements IConf
 		config.save();
 	}
 
+	public void trackUUID()
+	{
+		config.setProperty("uuid", base.getUniqueId());
+		config.save();
+	}
+
 	public void setConfigProperty(String node, Object object)
 	{
 		final String prefix = "info.";