diff --git a/seahub/templates/sysadmin/repoadmin_js.html b/seahub/templates/sysadmin/repoadmin_js.html
new file mode 100644
index 0000000000..0011f3a7c7
--- /dev/null
+++ b/seahub/templates/sysadmin/repoadmin_js.html
@@ -0,0 +1,26 @@
+{% load i18n%}
+addConfirmTo($('.repo-delete-btn'), {
+        'title':'{% trans "Delete Library" %}',
+        'con':'{% trans "Are you sure you want to delete %s ?" %}'
+});
+
+$('.repo-transfer-btn').click(function(){
+    var repo_id = $(this).data('id'),
+        repo_name = $(this).data('name'),
+        form = $('#repo-transfer-form');
+    
+    $('#repo-transfer-form input[name="repo_id"]').val(repo_id);
+    form.modal({appendTo:'#main'});
+    return false;
+});
+
+$('#repo-transfer-form').submit(function() {
+    var form = $(this),
+        form_id = form.attr('id'),
+        email = $.trim(form.children('[name="email"]').val());
+    if (!email) {
+        apply_form_error(form_id, "{% trans "Email cannot be blank" %}");
+        return false;
+    }
+    form.submit();
+});
diff --git a/seahub/templates/sysadmin/repoadmin_table.html b/seahub/templates/sysadmin/repoadmin_table.html
new file mode 100644
index 0000000000..66ad331ad1
--- /dev/null
+++ b/seahub/templates/sysadmin/repoadmin_table.html
@@ -0,0 +1,23 @@
+{% load i18n %}
+<table>
+    <tr>
+        <th width="15%">{% trans "Name" %}</th>
+        <th width="25%">ID</th>
+        <th width="20%">{% trans "Owner" %}</th>
+        <th width="27%">{% trans "Description" %}</th>
+        <th width="13%">{% trans "Operations" %}</th>
+    </tr>
+    {% for repo in repos %}
+    <tr>
+        <td>{{ repo.props.name }}</td>
+        <td style="font-size:11px;">{{ repo.id }}</td>
+        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a></td>
+        <td>{{ repo.props.desc }}</td>
+        <td>
+          <a href="#" data-url="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" data-target="{{ repo.props.name }}" class="repo-delete-btn op">{% trans "Delete" %}</a>
+          <a href="#" data-id="{{repo.id}}" data-name="{{repo.name}}" class="repo-transfer-btn op">{% trans "Transfer" %}</a>        
+        </td>
+        
+    </tr>
+    {% endfor %}
+</table>
diff --git a/seahub/templates/sysadmin/sys_repo_admin.html b/seahub/templates/sysadmin/sys_repo_admin.html
index 6195f21c9f..66538faaad 100644
--- a/seahub/templates/sysadmin/sys_repo_admin.html
+++ b/seahub/templates/sysadmin/sys_repo_admin.html
@@ -15,28 +15,7 @@
 
 {% block main_panel %}
 {% if repos %}
-<table>
-    <tr>
-        <th width="15%">{% trans "Name" %}</th>
-        <th width="25%">ID</th>
-        <th width="20%">{% trans "Owner" %}</th>
-        <th width="27%">{% trans "Description" %}</th>
-        <th width="13%">{% trans "Operations" %}</th>
-    </tr>
-    {% for repo in repos %}
-    <tr>
-        <td>{{ repo.props.name }}</td>
-        <td style="font-size:11px;">{{ repo.id }}</td>
-        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a></td>
-        <td>{{ repo.props.desc }}</td>
-        <td>
-          <a href="#" data-url="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" data-target="{{ repo.props.name }}" class="repo-delete-btn op">{% trans "Delete" %}</a>
-          <a href="#" data-id="{{repo.id}}" data-name="{{repo.name}}" class="repo-transfer-btn op">{% trans "Transfer" %}</a>        
-        </td>
-        
-    </tr>
-    {% endfor %}
-</table>
+{% include "sysadmin/repoadmin_table.html" %}
 
 <div id="paginator">
     {% if current_page != 1 %}
@@ -84,35 +63,10 @@
 
 {% block extra_script %}
 <script type="text/javascript">
-addConfirmTo($('.repo-delete-btn'), {
-        'title':'{% trans "Delete Library" %}',
-        'con':'{% trans "Are you sure you want to delete %s ?" %}'
-});
-
 $('#search-repo-btn').click(function() {
     location.href = "{% url 'sys_repo_search' %}";
 });
-
-$('.repo-transfer-btn').click(function(){
-    var repo_id = $(this).data('id'),
-        repo_name = $(this).data('name'),
-        form = $('#repo-transfer-form');
-    
-    $('#repo-transfer-form input[name="repo_id"]').val(repo_id);
-    form.modal({appendTo:'#main'});
-    return false;
-});
-
-$('#repo-transfer-form').submit(function() {
-    var form = $(this),
-        form_id = form.attr('id'),
-        email = $.trim(form.children('[name="email"]').val());
-    if (!email) {
-        apply_form_error(form_id, "{% trans "Email cannot be blank" %}");
-        return false;
-    }
-    form.submit();
-});
+{% include "sysadmin/repoadmin_js.html" %}
 </script>
 {% endblock %}
  
diff --git a/seahub/templates/sysadmin/sys_repo_search.html b/seahub/templates/sysadmin/sys_repo_search.html
index d17cd31812..3a5baecc60 100644
--- a/seahub/templates/sysadmin/sys_repo_search.html
+++ b/seahub/templates/sysadmin/sys_repo_search.html
@@ -13,27 +13,23 @@
 
 <h3>{% trans "Result"%}</h3>
 {% if repos %}
-<table>
-    <tr>
-        <th width="15%">{% trans "Name" %}</th>
-        <th width="25%">ID</th>
-        <th width="20%">{% trans "Owner" %}</th>
-        <th width="30%">{% trans "Description" %}</th>
-        <th width="10%">{% trans "Operations" %}</th>
-    </tr>
-    {% for repo in repos %}
-    <tr>
-        <td>{{ repo.props.name }}</td>
-        <td style="font-size:11px;">{{ repo.id }}</td>
-        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a></td>
-        <td>{{ repo.props.desc }}</td>
-        <td><a href="#" data-url="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" data-target="{{ repo.props.name }}" class="repo-delete-btn op">{% trans "Delete" %}</a></td>
-    </tr>
-    {% endfor %}
-</table>
+{% include "sysadmin/repoadmin_table.html" %}
+
 {% else %}
 <p>{% trans "No result" %}</p>
 {% endif %}
+
+<form id="repo-transfer-form" method="post" action="{% url 'sys_repo_transfer' %}" class="simple-input-popup hide">{% csrf_token %}
+  <h3>{% trans "Transfer Library"%}</h3>
+  <label>{% trans "Email" %}</label><br />
+  <input type="text" name="email" value="" class="long-input"/><br />
+  <input type="hidden" name="repo_id" value="" />
+
+  <p class="error hide"></p>
+  <input type="submit" value="{% trans "Submit" %}" class="submit" />
+  <button class="simplemodal-close">{% trans "Cancel" %}</button>
+</form>
+
 {% endblock %}
 
 {% block extra_script %}
@@ -47,5 +43,7 @@ $('#search-repo-form').submit(function() {
         return false;
     }
 });
+{% include "sysadmin/repoadmin_js.html" %}
+
 </script>
 {% endblock %}
diff --git a/seahub/templates/sysadmin/sys_useradmin.html b/seahub/templates/sysadmin/sys_useradmin.html
index 93b876e3e5..bde93ba00b 100644
--- a/seahub/templates/sysadmin/sys_useradmin.html
+++ b/seahub/templates/sysadmin/sys_useradmin.html
@@ -20,57 +20,7 @@
     <input type="submit" value="{% trans "Submit" %}" class="submit" />
 </form>
 
-<table>
-    <tr>
-        <th width="30%">{% trans "Email" %}</th>
-        <th width="10%">{% trans "Status" %}</th>
-        <th width="20%">{% trans "Space Used" %}</th>
-        <th width="15%">{% trans "Create At" %}</th>
-        <th width="25%">{% trans "Operations" %}</th>
-    </tr>
-
-    {% for user in users %}
-    <tr>
-        <td data="{{user.id}}"><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td>
-
-        <td>
-            <div class="user-status">
-              {% if user.is_active %}
-                <span class="user-status-cur-value">{% trans "Active" %}</span>
-              {% else %}
-                <span class="user-status-cur-value">{% trans "Inactive" %}</span>
-              {% endif %}
-                <img src="{{MEDIA_URL}}img/edit_12.png" alt="{% trans "Edit"%}" title="{% trans "Edit"%}" class="user-status-edit-icon vh" />
-            </div>
-            <select name="permission" class="user-status-select hide">
-                <option value="1" {%if user.is_active %}selected="selected"{% endif %}>{% trans "Active" %}</option>
-                <option value="0" {%if not user.is_active %}selected="selected"{% endif %}>{% trans "Inactive"%}</option>
-
-            </select>
-        </td>
-        
-        <td>
-            {% if CALC_SHARE_USAGE %}
-            {{ user.self_usage|filesizeformat }} + {{ user.share_usage|filesizeformat }} {% if user.quota > 0 %} / {{ user.quota|filesizeformat }} {% endif %}
-            {% else %}
-            {{ user.self_usage|filesizeformat }} {% if user.quota > 0 %} / {{ user.quota|filesizeformat }} {% endif %}
-            {% endif %}
-        </td>
-        <td>{{ user.ctime|tsstr_sec }}</td>
-        <td>
-          {% if not user.is_self %}
-          <a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a>
-          <a href="#" class="reset-user-btn op" data-url="{% url 'user_reset' user.id %}" data-target="{{ user.props.email }}">{% trans "ResetPwd" %}</a>
-          {% if user.is_staff %}
-          <a href="#" data-url="{% url 'user_remove_admin' user.id %}" data-target="{{ user.props.email }}" class="revoke-admin-btn op">{% trans "Revoke Admin" %}</a>
-          {% else %}
-          <a href="#" data-url="{% url 'user_make_admin' user.id %}" data-target="{{ user.props.email }}" class="set-admin-btn op">{% trans "Set Admin" %}</a>
-          {% endif %}
-          {% endif %}
-        </td>
-    </tr>
-    {% endfor %}
-</table>
+{% include "sysadmin/useradmin_table.html"%}
 
 <div id="paginator">
     {% if current_page != 1 %}
@@ -104,79 +54,10 @@
 
 {% block extra_script %}
 <script type="text/javascript">
-addConfirmTo($('.remove-user-btn'), {
-        'title':"{% trans "Delete User" %}",
-        'con':"{% trans "Are you sure you want to delete %s ?" %}"
-});
-addConfirmTo($('.reset-user-btn'), {
-        'title':"{% trans "Password Reset" %}",
-        'con':"{% trans "Are you sure you want to reset the password of %s ?" %}"
-});
-addConfirmTo($('.revoke-admin-btn'), {
-        'title':"{% trans "Revoke Admin" %}",
-        'con':"{% trans "Are you sure you want to revoke the admin permission of %s ?" %}"
-});
-addConfirmTo($('.set-admin-btn'), {
-        'title':"{% trans "Set Admin" %}",
-        'con':"{% trans "Are you sure you want to set %s as admin?" %}"
-});
-
-$('#add-user-btn').click(function() {
-        $('#add-user-form').modal();
-        $('#simplemodal-container').css({'width':'auto'});
-});
 $('#search-user-btn').click(function() {
     location.href = "{% url 'user_search' %}";
 });
 
-$('tr:gt(0)').hover(
-    function() {
-        $(this).find('.user-status-edit-icon').removeClass('vh');
-    },
-    function() {
-        $(this).find('.user-status-edit-icon').addClass('vh');
-    }
-);
-$('.user-status-edit-icon').click(function() {
-    $(this).parent().addClass('hide');
-    $(this).parent().next().removeClass('hide'); // show 'user-status-select'
-});
-$('.user-status-select').change(function() {
-    var select = $(this),
-        uid = $(this).parent().prev().attr('data'),
-        select_val = select.val(),
-        url = "{{ SITE_ROOT }}useradmin/toggle_status/" + uid + "/?s=" + select_val;
-
-    $.ajax({
-        url: url,
-        type: 'GET',
-        dataType: 'json',
-        cache: false,
-        success: function(data) {
-            if (data['success']) {
-                feedback("{% trans "Edit succeeded" %}", 'success');
-                select.prev().children('.user-status-cur-value').html(select.children('option[value="' +select.val() + '"]').text());
-            }
-            select.addClass('hide');
-            select.prev().removeClass('hide');
-        },
-        error: function() {
-            feedback("{% trans "Edit failed." %}", 'error');
-            select.addClass('hide');
-            select.prev().removeClass('hide');
-        }   
-    });
-});
-// select shows, but the user doesn't select a value, or doesn't change the permission, click other place to hide the select
-$(document).click(function(e) {
-    var target = e.target || event.srcElement;
-    // target can't be edit-icon
-    if (!$('.user-status-edit-icon, .user-status-select').is(target)) {
-        $('.user-status').removeClass('hide');
-        $('.user-status-select').addClass('hide');
-    }
-});
-
 $('#add-user-form').submit(function() {
     var form = $(this),
         form_id = $(this).attr('id'),
@@ -197,10 +78,12 @@ $('#add-user-form').submit(function() {
         return false;
     } 
     if (pwd1 != pwd2) {
-        apply_form_error(form_id, "{% trans "Passwords don't match" %}");
+        apply_form_error(form_id, "{% trans "Passwords do not match" %}");
         return false;
     } 
 
+    var submit_btn = $(this).find('input[type="submit"]');
+    disable(submit_btn);
     $.ajax({
         url: '{% url 'user_add' %}',
         type: 'POST',
@@ -223,9 +106,12 @@ $('#add-user-form').submit(function() {
             } else {
                 apply_form_error(form_id, "{% trans "Failed. Please check the network." %}");
             }
+            enable(submit_btn);
         }
     });
     return false;
 });
+
+{% include "sysadmin/useradmin_js.html" %}
 </script>
 {% endblock %}
diff --git a/seahub/templates/sysadmin/user_search.html b/seahub/templates/sysadmin/user_search.html
index 30724d1902..c22b297947 100644
--- a/seahub/templates/sysadmin/user_search.html
+++ b/seahub/templates/sysadmin/user_search.html
@@ -11,45 +11,7 @@
 </form>
 <h3>{% trans "Result"%}</h3>
 {% if users %}
-<table>
-    <tr>
-        <th width="30%">{% trans "Email" %}</th>
-        <th width="10%">{% trans "Status" %}</th>
-        <th width="20%">{% trans "Space Used" %}</th>
-        <th width="15%">{% trans "Create At" %}</th>
-        <th width="25%">{% trans "Operations" %}</th>
-    </tr>
-
-    {% for user in users %}
-    <tr>
-        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td>
-        {% if user.props.is_active %}
-        <td>{% trans "Activated" %}</td>
-        {% else %}
-        <td><a href="{{ SITE_ROOT }}useradmin/activate/{{ user.props.id }}/" class="activate op">{% trans "Active" %}</a></td>
-        {% endif %}
-        <td>
-            {% if CALC_SHARE_USAGE %}
-            {{ user.self_usage|filesizeformat }} + {{ user.share_usage|filesizeformat }} {% if user.quota > 0 %} / {{ user.quota|filesizeformat }} {% endif %}
-            {% else %}
-            {{ user.self_usage|filesizeformat }} {% if user.quota > 0 %} / {{ user.quota|filesizeformat }} {% endif %}
-            {% endif %}
-        </td>
-        <td>{{ user.ctime|tsstr_sec }}</td>
-        <td>
-          {% if not user.is_self %}
-          <a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a>
-          <a href="#" class="reset-user-btn op" data-url="{% url 'user_reset' user.id %}" data-target="{{ user.props.email }}">{% trans "ResetPwd" %}</a>
-          {% if user.is_staff %}
-          <a href="#" data-url="{% url 'user_remove_admin' user.id %}" data-target="{{ user.props.email }}" class="revoke-admin-btn op">{% trans "Revoke Admin" %}</a>
-          {% else %}
-          <a href="#" data-url="{% url 'user_make_admin' user.id %}" data-target="{{ user.props.email }}" class="set-admin-btn op">{% trans "Set Admin" %}</a>
-          {% endif %}
-          {% endif %}
-        </td
-    </tr>
-    {% endfor %}
-</table>
+{% include "sysadmin/useradmin_table.html" %}
 {% else %}
 <p>{% trans "No result" %}</p>
 {% endif %}
@@ -63,5 +25,8 @@ $('#search-user-form').submit(function() {
         return false;
     }
 });
+
+{% include "sysadmin/useradmin_js.html" %}
+
 </script>
 {% endblock %}
diff --git a/seahub/templates/sysadmin/useradmin_js.html b/seahub/templates/sysadmin/useradmin_js.html
new file mode 100644
index 0000000000..ec4abdfc9a
--- /dev/null
+++ b/seahub/templates/sysadmin/useradmin_js.html
@@ -0,0 +1,69 @@
+{% load i18n%}
+addConfirmTo($('.remove-user-btn'), {
+        'title':"{% trans "Delete User" %}",
+        'con':"{% trans "Are you sure you want to delete %s ?" %}"
+});
+addConfirmTo($('.reset-user-btn'), {
+        'title':"{% trans "Password Reset" %}",
+        'con':"{% trans "Are you sure you want to reset the password of %s ?" %}"
+});
+addConfirmTo($('.revoke-admin-btn'), {
+        'title':"{% trans "Revoke Admin" %}",
+        'con':"{% trans "Are you sure you want to revoke the admin permission of %s ?" %}"
+});
+addConfirmTo($('.set-admin-btn'), {
+        'title':"{% trans "Set Admin" %}",
+        'con':"{% trans "Are you sure you want to set %s as admin?" %}"
+});
+
+$('#add-user-btn').click(function() {
+        $('#add-user-form').modal();
+        $('#simplemodal-container').css({'width':'auto'});
+});
+$('tr:gt(0)').hover(
+    function() {
+        $(this).find('.user-status-edit-icon').removeClass('vh');
+    },
+    function() {
+        $(this).find('.user-status-edit-icon').addClass('vh');
+    }
+);
+$('.user-status-edit-icon').click(function() {
+    $(this).parent().addClass('hide');
+    $(this).parent().next().removeClass('hide'); // show 'user-status-select'
+});
+$('.user-status-select').change(function() {
+    var select = $(this),
+        uid = $(this).parent().prev().attr('data'),
+        select_val = select.val(),
+        url = "{{ SITE_ROOT }}useradmin/toggle_status/" + uid + "/?s=" + select_val;
+
+    $.ajax({
+        url: url,
+        type: 'GET',
+        dataType: 'json',
+        cache: false,
+        success: function(data) {
+            if (data['success']) {
+                feedback("{% trans "Edit succeeded" %}", 'success');
+                select.prev().children('.user-status-cur-value').html(select.children('option[value="' +select.val() + '"]').text());
+            }
+            select.addClass('hide');
+            select.prev().removeClass('hide');
+        },
+        error: function() {
+            feedback("{% trans "Edit failed." %}", 'error');
+            select.addClass('hide');
+            select.prev().removeClass('hide');
+        }   
+    });
+});
+// select shows, but the user doesn't select a value, or doesn't change the permission, click other place to hide the select
+$(document).click(function(e) {
+    var target = e.target || event.srcElement;
+    // target can't be edit-icon
+    if (!$('.user-status-edit-icon, .user-status-select').is(target)) {
+        $('.user-status').removeClass('hide');
+        $('.user-status-select').addClass('hide');
+    }
+});
diff --git a/seahub/templates/sysadmin/useradmin_table.html b/seahub/templates/sysadmin/useradmin_table.html
new file mode 100644
index 0000000000..57289fcbe8
--- /dev/null
+++ b/seahub/templates/sysadmin/useradmin_table.html
@@ -0,0 +1,52 @@
+{%load seahub_tags i18n%}
+<table>
+    <tr>
+        <th width="30%">{% trans "Email" %}</th>
+        <th width="10%">{% trans "Status" %}</th>
+        <th width="20%">{% trans "Space Used" %}</th>
+        <th width="15%">{% trans "Create At" %}</th>
+        <th width="25%">{% trans "Operations" %}</th>
+    </tr>
+
+    {% for user in users %}
+    <tr>
+        <td data="{{user.id}}"><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td>
+
+        <td>
+            <div class="user-status">
+              {% if user.is_active %}
+                <span class="user-status-cur-value">{% trans "Active" %}</span>
+              {% else %}
+                <span class="user-status-cur-value">{% trans "Inactive" %}</span>
+              {% endif %}
+                <img src="{{MEDIA_URL}}img/edit_12.png" alt="{% trans "Edit"%}" title="{% trans "Edit"%}" class="user-status-edit-icon vh" />
+            </div>
+            <select name="permission" class="user-status-select hide">
+                <option value="1" {%if user.is_active %}selected="selected"{% endif %}>{% trans "Active" %}</option>
+                <option value="0" {%if not user.is_active %}selected="selected"{% endif %}>{% trans "Inactive"%}</option>
+
+            </select>
+        </td>
+        
+        <td>
+            {% if CALC_SHARE_USAGE %}
+            {{ user.self_usage|filesizeformat }} + {{ user.share_usage|filesizeformat }} {% if user.quota > 0 %} / {{ user.quota|filesizeformat }} {% endif %}
+            {% else %}
+            {{ user.self_usage|filesizeformat }} {% if user.quota > 0 %} / {{ user.quota|filesizeformat }} {% endif %}
+            {% endif %}
+        </td>
+        <td>{{ user.ctime|tsstr_sec }}</td>
+        <td>
+          {% if not user.is_self %}
+          <a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a>
+          <a href="#" class="reset-user-btn op" data-url="{% url 'user_reset' user.id %}" data-target="{{ user.props.email }}">{% trans "ResetPwd" %}</a>
+          {% if user.is_staff %}
+          <a href="#" data-url="{% url 'user_remove_admin' user.id %}" data-target="{{ user.props.email }}" class="revoke-admin-btn op">{% trans "Revoke Admin" %}</a>
+          {% else %}
+          <a href="#" data-url="{% url 'user_make_admin' user.id %}" data-target="{{ user.props.email }}" class="set-admin-btn op">{% trans "Set Admin" %}</a>
+          {% endif %}
+          {% endif %}
+        </td>
+    </tr>
+    {% endfor %}
+</table>
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 5782c64add..74f691345a 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -545,7 +545,11 @@ def sys_repo_transfer(request):
             messages.error(request, _(u'Failed to transfer, user %s not found') % new_owner)
     else:
         messages.error(request, _(u'Failed to transfer, invalid arguments.'))
-    return HttpResponseRedirect(reverse(sys_repo_admin))
+
+    next = request.META.get('HTTP_REFERER', None)
+    if not next:
+        next = reverse(sys_repo_admin)
+    return HttpResponseRedirect(next)
     
 @login_required
 @sys_staff_required