diff --git a/changelog.txt b/changelog.txt
index 892ddbb33..57d36c2ad 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 09/20/2014 ==
+demonstar55: Fix crash in SendEnterWorld on illegally long names
+
 == 09/19/2014 ==
 demonstar55: Added Client::Tell_StringID (used in tell queue messages)
 demonstar55: Tell queues (and offline) messages now show correctly
diff --git a/world/client.cpp b/world/client.cpp
index f5f634083..0970d6866 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -130,7 +130,7 @@ void Client::SendLogServer()
 
 void Client::SendEnterWorld(std::string name)
 {
-char char_name[32]= { 0 };
+	char char_name[64] = { 0 };
 	if (pZoning && database.GetLiveChar(GetAccountID(), char_name)) {
 		if(database.GetAccountIDByChar(char_name) != GetAccountID()) {
 			eqs->Close();