diff --git a/changelog.txt b/changelog.txt
index 204d08d7b..6c5d695ab 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 05/22/2015 ==
+Uleat: Added null-term declaration for character names in ENCODE(OP_CharInfo) - where appropriate
+
 == 05/20/2015 ==
 demonstar55: Bard instrument mods should be more consistent with live. Zoning will keep instrument mod for long duration buffs (selo's)
 	Still need to have procs/doom effects to inherit the instrument mods from their source buff/whatever
diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp
index bfb47492a..89ad7db7f 100644
--- a/common/patches/rof.cpp
+++ b/common/patches/rof.cpp
@@ -2949,8 +2949,9 @@ namespace RoF
 			eq_cse = (structs::CharacterSelectEntry_Struct *)eq_ptr;
 
 			strcpy(eq_cse->Name, emu_cse->Name);
-			eq_ptr += strlen(eq_cse->Name);
+			eq_ptr += strlen(emu_cse->Name);
 			eq_cse = (structs::CharacterSelectEntry_Struct *)eq_ptr;
+			eq_cse->Name[0] = '\0';
 
 			eq_cse->Class = emu_cse->Class;
 			eq_cse->Race = emu_cse->Race;
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
index da9fa311a..75c4c7836 100644
--- a/common/patches/rof2.cpp
+++ b/common/patches/rof2.cpp
@@ -3038,8 +3038,9 @@ namespace RoF2
 			eq_cse = (structs::CharacterSelectEntry_Struct *)eq_ptr;
 
 			strcpy(eq_cse->Name, emu_cse->Name);
-			eq_ptr += strlen(eq_cse->Name);
+			eq_ptr += strlen(emu_cse->Name);
 			eq_cse = (structs::CharacterSelectEntry_Struct *)eq_ptr;
+			eq_cse->Name[0] = '\0';
 
 			eq_cse->Class = emu_cse->Class;
 			eq_cse->Race = emu_cse->Race;
diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp
index a4765939d..8e730cfb9 100644
--- a/common/patches/sod.cpp
+++ b/common/patches/sod.cpp
@@ -1969,8 +1969,9 @@ namespace SoD
 			eq_cse->Gender = emu_cse->Gender;
 
 			strcpy(eq_cse->Name, emu_cse->Name);
-			eq_ptr += strlen(eq_cse->Name);
+			eq_ptr += strlen(emu_cse->Name);
 			eq_cse = (structs::CharacterSelectEntry_Struct *)eq_ptr;
+			eq_cse->Name[0] = '\0';
 
 			eq_cse->Beard = emu_cse->Beard;
 			eq_cse->HairColor = emu_cse->HairColor;
diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp
index 186515b3b..a677cede3 100644
--- a/common/patches/sof.cpp
+++ b/common/patches/sof.cpp
@@ -1628,8 +1628,9 @@ namespace SoF
 			eq_cse->Gender = emu_cse->Gender;
 
 			strcpy(eq_cse->Name, emu_cse->Name);
-			eq_ptr += strlen(eq_cse->Name);
+			eq_ptr += strlen(emu_cse->Name);
 			eq_cse = (structs::CharacterSelectEntry_Struct *)eq_ptr;
+			eq_cse->Name[0] = '\0';
 
 			eq_cse->Beard = emu_cse->Beard;
 			eq_cse->HairColor = emu_cse->HairColor;
diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp
index 58131bd35..4177e4f81 100644
--- a/common/patches/uf.cpp
+++ b/common/patches/uf.cpp
@@ -2260,8 +2260,9 @@ namespace UF
 			eq_cse->Gender = emu_cse->Gender;
 
 			strcpy(eq_cse->Name, emu_cse->Name);
-			eq_ptr += strlen(eq_cse->Name);
+			eq_ptr += strlen(emu_cse->Name);
 			eq_cse = (structs::CharacterSelectEntry_Struct *)eq_ptr;
+			eq_cse->Name[0] = '\0';
 
 			eq_cse->Beard = emu_cse->Beard;
 			eq_cse->HairColor = emu_cse->HairColor;