diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 04d73a3e59a..1c4bc7a574f 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -22,9 +22,9 @@
 
 //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
 #define MAX_MESSAGE_LEN			1024
-#define MAX_NAME_LEN			26
+#define MAX_NAME_LEN			42
 #define MAX_BROADCAST_LEN		512
-#define MAX_CHARTER_LEN			50
+#define MAX_CHARTER_LEN			80
 
 //MINOR TWEAKS/MISC
 #define AGE_MIN				17	//youngest a character can be