diff --git a/djangopeople/djangopeople/forms.py b/djangopeople/djangopeople/forms.py
index 044b28d..79ad8f5 100644
--- a/djangopeople/djangopeople/forms.py
+++ b/djangopeople/djangopeople/forms.py
@@ -354,8 +354,8 @@ def __init__(self, *args, **kwargs):
                 'field': BoundField(self, field, 'im_' + shortname),
             })
 
-    first_name = forms.CharField(label=_('First name'))
-    last_name = forms.CharField(label=_('Last name'))
+    first_name = forms.CharField(label=_('First name'), max_length=30)
+    last_name = forms.CharField(label=_('Last name'), max_length=30)
     email = forms.EmailField(label=_('E-mail'))
     blog = forms.URLField(label=_('Blog URL'), required=False)
     privacy_search = forms.ChoiceField(