diff --git a/media/css/seahub.css b/media/css/seahub.css
index 161b751c1e..c9a874c8ab 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -96,11 +96,14 @@ button {
     margin:0;
 }
 label { display: inline-block; margin:2px 0px; }
-#user-add-form label {
+#user-add-form label,
+.reg label,
+.pwd_change label {
     width:5em;
     text-align:right;
 }
-#user-add-form .submit {
+#user-add-form .submit,
+.reg .submit {
     margin-left:5em;
 }
 .login .submit {
@@ -109,6 +112,12 @@ label { display: inline-block; margin:2px 0px; }
 .login .error {
     margin:3px 0 0 3em;
 }
+.pwd_change label {
+    width:6em;
+}
+.pwd_change .submit {
+    margin-left:6em;
+}
 /* form */
 /* forms */
 
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index f95bd051f0..b7d578da52 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -2,16 +2,14 @@
 {% load i18n %}
 {% block title %}{% trans 'Password change' %}{% endblock %}
 {% block main_panel %}
-<div class="pwd_change">
 <h2>{% trans 'Password change' %}</h2>
-<form action="" method="post">
+<form action="" method="post" class="pwd_change">
+<label for="id_old_password">当前密码：</label>{{ form.old_password }}<br />
 {{ form.old_password.errors }}
-<p><label for="id_old_password">当前密码：</label>{{ form.old_password }}</p>
+<label for="id_new_password1">新密码：</label>{{ form.new_password1 }}<br />
 {{ form.new_password1.errors }}
-<p><label for="id_new_password1">新密码：</label>{{ form.new_password1 }}</p>
+<label for="id_new_password2">新密码确认：</label>{{ form.new_password2 }}<br />
 {{ form.new_password2.errors }}
-<p><label for="id_new_password2">新密码确认：</label>{{ form.new_password2 }}</p>
-<p><input type="submit" value="提交" class="submit" /></p>
+<input type="submit" value="提交" class="submit" />
 </form>
-</div>
 {% endblock %}
diff --git a/views.py b/views.py
index a8633efb2e..96471304e8 100644
--- a/views.py
+++ b/views.py
@@ -106,7 +106,7 @@ def repo(request, repo_id):
         current_page = int(request.GET.get('page', '1'))
         per_page= int(request.GET.get('per_page', '25'))
     except ValueError:
-        page = 1
+        current_page = 1
         per_page = 25
 
     commits_all = get_commits(repo_id, per_page * (current_page -1), per_page + 1)
@@ -238,7 +238,7 @@ def seafadmin(request):
         current_page = int(request.GET.get('page', '1'))
         per_page= int(request.GET.get('per_page', '25'))
     except ValueError:
-        page = 1
+        current_page = 1
         per_page = 25
 
     repos_all = seafserv_threaded_rpc.get_repo_list(per_page * (current_page -1), per_page + 1)