diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 369eb3808..e68a9e93a 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -120,7 +120,9 @@ public class EssentialsPlayerListener implements Listener
 		{
 			user.toggleVanished();
 		}
-		user.setLastLocation();
+		if (user.getLastLocation() == null) {
+				user.setLastLocation();
+		}
 		user.updateActivity(false);
 		user.dispose();
 	}