Minor fixes.

2 files changed, 7 insertions, 10 deletions

diff --git a/templates/changepw/index.html b/templates/changepw/index.html
index bd607ef..55badd8 100644
--- a/templates/changepw/index.html
+++ b/templates/changepw/index.html
@@ -11,18 +11,15 @@
 
 <table>
     <tr>
-        <th>Your usernames</th>
-    </tr>
-    <tr>
-        <td>Username:</td><td>{{ username }}</td>
+        <th>Username:</th><td>{{ username }}</td>
     </tr>
 </table>
 
-<p>Available actions:</p>
-<ul>
-    <li><a href="{% url changepw %}">Change password.</a></li>
-    <li><a href="{% url resetpw %}">Reset password.</a></li>
-</ul>
+<p>
+    Available actions:
+    <a href="{% url changepw %}">Change password</a>
+    <a href="{% url resetpw %}">Reset password</a>
+</p>
 
 <p><a href="{% url logout %}">Log out</a></p>
 {% endblock %}
diff --git a/views.py b/views.py
index 6b43181..564a3f8 100644
--- a/views.py
+++ b/views.py
@@ -52,6 +52,7 @@ def change_password(request):
     changing script will be run with the username and new password.
     The function that changes the password has to be provided as func.
     '''
+    username = _get_username(request)
     if request.method == 'POST':
         form = ChangePasswordForm(request.POST)
         if form.is_valid():
@@ -62,7 +63,6 @@ def change_password(request):
                             context_instance=RequestContext(request))
     else:
         form = ChangePasswordForm()
-        username = _get_username(request)
     return render_to_response('changepw/change_password.html',
                             {'form': form, 'username': username},
                             context_instance=RequestContext(request))