diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index fe811e50f..3e335a1df 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -286,7 +286,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 	public void setDisplayNick(String name)
 	{
 		setDisplayName(name);
-		setPlayerListName(name);
+		//TODO: Maybe we need to limit nick length, or try use a string trim.
+		if (name.length() <= 16) {
+			setPlayerListName(name);
+		}
 	}
 
 	public Teleport getTeleport()