diff --git a/modoboa/core/forms.py b/modoboa/core/forms.py
index 6d968f13d..1444b2265 100644
--- a/modoboa/core/forms.py
+++ b/modoboa/core/forms.py
@@ -37,6 +37,10 @@ class ProfileForm(forms.ModelForm):
     class Meta:
         model = User
         fields = ("first_name", "last_name")
+        widgets = {
+                    'first_name': forms.TextInput(attrs={'class': 'form-control'}),
+                    'last_name': forms.TextInput(attrs={'class': 'form-control'})
+                 }
 
     def __init__(self, update_password, *args, **kwargs):
         super(ProfileForm, self).__init__(*args, **kwargs)
diff --git a/modoboa/extensions/admin/forms/account.py b/modoboa/extensions/admin/forms/account.py
index 04d53a5ee..7c7e89e35 100644
--- a/modoboa/extensions/admin/forms/account.py
+++ b/modoboa/extensions/admin/forms/account.py
@@ -38,6 +38,12 @@ class AccountFormGeneral(forms.ModelForm):
         widget=forms.PasswordInput(attrs={"class": "form-control"}),
         help_text=ugettext_lazy("Enter the same password as above, for verification.")
     )
+    first_name= forms.CharField(
+        widget=forms.TextInput(attrs={"class": "form-control"}),
+    )
+    last_name= forms.CharField(
+        widget=forms.TextInput(attrs={"class": "form-control"}),
+    )
 
     class Meta:
         model = User