2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 641e07db6..74a5a1f1f 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -83,6 +83,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot):
     updateHair();
 
     mNameField = new TextField("");
+    mNameField->setMaximum(24);
     mNameLabel = new Label(_("Name:"));
     // TRANSLATORS: This is a narrow symbol used to denote 'next'.
     // You may change this symbol if your language uses another.
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 065b532c4..7bb7b7fed 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -37,6 +37,7 @@
 
 class LocalPlayer;
 class PlayerBox;
+class TextField;
 
 /**
  * Character creation dialog.
@@ -90,7 +91,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
 
         CharSelectDialog *mCharSelectDialog;
 
-        gcn::TextField *mNameField;
+        TextField *mNameField;
         gcn::Label *mNameLabel;
         gcn::Button *mNextHairColorButton;
         gcn::Button *mPrevHairColorButton;