diff --git a/templates/edit_user.html b/templates/edit_user.html
index 6a2893b..91d10b9 100644
--- a/templates/edit_user.html
+++ b/templates/edit_user.html
@@ -11,6 +11,10 @@
 <input type="submit" name="edit" value="Edit" /><input type="submit" name="cancel" value="Cancel" />
 </form>
 {% else %}
+<form action="/user/edit/{{ user_to_edit.id }}" method="post">
+{% csrf_token %}
 {{ form.as_p }}
+<input type="submit" name="cancel" value="Cancel" />
+</form>
 {% endif %}
 {% endblock %}
diff --git a/templates/user.html b/templates/user.html
index 5ffc406..2068105 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -5,10 +5,10 @@
 <b>Any user available</b><br/><br/>
 {% else %}
 {% for user in users %}
-{% if user.first_name|length != 0 or user.last_name|length != 0%} 
+{% if user.first_name != "" or user.last_name != "" %} 
     <li><a href="/user/{{ user.id }}">{{ user.first_name }} {{ user.last_name }}</a></li>
 {% else %}
-    <li><a href="/user/{{ user.id }}">{{ user.login }}</a></li>
+    <li><a href="/user/{{ user.id }}">{{ user.username }}</a></li>
 {% endif %}
 {% endfor %}
 {% endif %}
diff --git a/views.py b/views.py
index 2921f68..63858b9 100644
--- a/views.py
+++ b/views.py
@@ -150,7 +150,7 @@ def edit_user(request, user_id):
 
     if request.method == 'POST': # If the form has been submitted...
         if int(user_id) != int(request.user.id) and (not request.user.is_superuser):
-            return HttpResponseRedirect('/user/' + str(user_id))
+            return HttpResponseRedirect('/user')
         if 'edit' in request.POST:
             form = UserForm(request.POST, instance=user, initial={'password':''}) # A form bound to the POST data
             if form.is_valid(): # All validation rules pass