diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 7a7ae4498..8ddc540ba 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -168,6 +168,7 @@ public class EssentialsPlayerListener extends PlayerListener
 		{
 			user.setDisplayNick(user.getNick());
 		}
+		user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
 		user.updateActivity(false);
 		if (user.isAuthorized("essentials.sleepingignored"))
 		{
@@ -231,7 +232,6 @@ public class EssentialsPlayerListener extends PlayerListener
 		event.allow();
 
 		user.setLastLogin(System.currentTimeMillis());
-		user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
 		updateCompass(user);
 	}
 
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 973ffd401..2bbd32259 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -290,7 +290,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	@Override
 	public String getDisplayName()
 	{
-		if (ess.getSettings().changeDisplayName())
+		if (!(base instanceof OfflinePlayer) && ess.getSettings().changeDisplayName())
 		{
 			setDisplayNick(getNick());
 		}