diff --git a/src/accounts/forms.py b/src/accounts/forms.py
index 74972d4..f92195c 100644
--- a/src/accounts/forms.py
+++ b/src/accounts/forms.py
@@ -36,7 +36,7 @@ class UserCreationForm(UserForm):
 class UserUpdateForm(UserForm):
     class Meta:
         model = User
-        fields = ('first_name', 'last_name', 'email', 'username',
+        fields = ('username', 'first_name', 'last_name', 'email',
                   'institution', 'role', 'twitter', 'facebook',
                   'google_talk', 'webpage')
 
diff --git a/src/accounts/templates/accounts/user_create_form.html b/src/accounts/templates/accounts/user_create_form.html
index 72d0e29..9106145 100644
--- a/src/accounts/templates/accounts/user_create_form.html
+++ b/src/accounts/templates/accounts/user_create_form.html
@@ -30,7 +30,7 @@
             <legend>{% trans 'Personal Information' %}</legend>
             {% for field in user_form %}
               <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
-                <label for="first_name" class="control-label">
+                <label for="{{ field.name }}" class="control-label">
                   {{ field.label }}
                 </label>
                 {{ field }}
diff --git a/src/accounts/templates/accounts/user_update_form.html b/src/accounts/templates/accounts/user_update_form.html
index 650f2c9..337fe01 100644
--- a/src/accounts/templates/accounts/user_update_form.html
+++ b/src/accounts/templates/accounts/user_update_form.html
@@ -2,10 +2,35 @@
 {% load i18n gravatar %}
 
 {% block main-content %}
-    <form method="post">
-      {% csrf_token %}
-      {{ form.as_p }}
-    
-      <button type="submit" class="btn btn-primary">{% trans "Update" %}</button>
-    </form>
+  <form method="post">
+    {% csrf_token %}
+
+    <div class="col-lg-12">
+      <a href="https://gravatar.com" target="_blank">
+        {% gravatar request.user.email 50 %}
+        {% trans "Change your avatar at Gravatar.com" %}
+      </a>
+    </div>
+    <br>
+
+    <div class="row">
+      {% for field in form %}
+      <div class="col-lg-4 col-md-6 col-sm-12 col-xm-12">
+        <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
+          <label for="{{ field.name }}" class="control-label">
+            {{ field.label }}
+          </label>
+          {{ field }}
+          {{ field.errors }}
+        </div>
+      </div>
+      {% endfor %}
+    </div>
+
+    <div class="row">
+      <div class="submit">
+        <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
+      </div>
+    </div>
+  </form>
 {% endblock %}
diff --git a/src/colab/static/css/screen.css b/src/colab/static/css/screen.css
index 48f4aac..b9d45d8 100644
--- a/src/colab/static/css/screen.css
+++ b/src/colab/static/css/screen.css
@@ -145,7 +145,7 @@ form.signup .form-group {
     margin-left: 0.5em;
 }
 
-form.signup div.submit {
+div.submit {
     margin: auto;
     margin-bottom: 5em;
     width: 200px;
--
libgit2 0.21.2