diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html
index 5aeaafb50..ea5269ddc 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html
@@ -10,7 +10,7 @@
         {{ form|crispy }}
         <div class="control-group">
           <div class="controls">
-            <button type="submit" class="btn">Update</button>
+            <button type="submit" class="btn btn-primary">Update</button>
           </div>
         </div>
     </form>
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py
index 8327d2890..e654850d2 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                 ('date_joined', models.DateTimeField(verbose_name='date joined', default=django.utils.timezone.now)),
                 ('groups', models.ManyToManyField(related_name='user_set', blank=True, verbose_name='groups', to='auth.Group', help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_query_name='user')),
                 ('user_permissions', models.ManyToManyField(related_name='user_set', blank=True, verbose_name='user permissions', to='auth.Permission', help_text='Specific permissions for this user.', related_query_name='user')),
-                ('name', models.CharField(max_length=255, verbose_name='Name of User', blank=True)),
+                ('nickname', models.CharField(max_length=255, verbose_name='Nickname', blank=True)),
             ],
             options={
                 'verbose_name': 'user',
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py
index 447bc077b..612495aca 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py
@@ -11,9 +11,7 @@ from django.utils.translation import ugettext_lazy as _
 @python_2_unicode_compatible
 class User(AbstractUser):
 
-    # First Name and Last Name do not cover name patterns
-    # around the globe.
-    name = models.CharField(_("Name of User"), blank=True, max_length=255)
+    nickname = models.CharField(_("Nickname"), blank=True, max_length=255)
 
     def __str__(self):
         return self.username
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py
index f1b523b37..7dceec9ea 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py
@@ -26,7 +26,7 @@ class UserRedirectView(LoginRequiredMixin, RedirectView):
 
 class UserUpdateView(LoginRequiredMixin, UpdateView):
 
-    fields = ['name', ]
+    fields = ['nickname', 'first_name', 'last_name', ]
 
     # we already imported User in the view code above, remember?
     model = User