diff --git a/changelog.txt b/changelog.txt
index 57d36c2ad..b521da3fe 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
 == 09/20/2014 ==
 demonstar55: Fix crash in SendEnterWorld on illegally long names
+demonstar55: The client only lets you enter 15 characters for your name (UF at least)
 
 == 09/19/2014 ==
 demonstar55: Added Client::Tell_StringID (used in tell queue messages)
diff --git a/common/database.cpp b/common/database.cpp
index 88f01a676..ca287c3b5 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -1140,7 +1140,7 @@ bool Database::CheckNameFilter(const char* name, bool surname)
 	else
 	{
 		// the minimum 4 is enforced by the client too
-		if(!name || strlen(name) < 4 || strlen(name) > 64)
+		if(!name || strlen(name) < 4 || strlen(name) > 15)
 		{
 			return false;
 		}