diff --git a/base/templatetags/seahub_tags.py b/base/templatetags/seahub_tags.py
index 8501be2b3a..5ebbd3495c 100644
--- a/base/templatetags/seahub_tags.py
+++ b/base/templatetags/seahub_tags.py
@@ -256,3 +256,8 @@ def translate_permission(value):
         return _(u'Read-Only')
     else:
         return ''
+
+@register.filter(name='quote')
+def quote(value):
+    from urllib2 import quote
+    return quote(value)
diff --git a/contacts/templates/contacts/contact_list.html b/contacts/templates/contacts/contact_list.html
index 02f470dd10..c57ec1923d 100644
--- a/contacts/templates/contacts/contact_list.html
+++ b/contacts/templates/contacts/contact_list.html
@@ -1,5 +1,5 @@
 {% extends "myhome_base.html" %}
-{% load avatar_tags i18n %}
+{% load avatar_tags i18n seahub_tags %}
 
 {% block nav_contacts_class %}class="cur"{% endblock %}
 
@@ -31,7 +31,7 @@
         <td>{{ contact.note }}</td>
         <td>
             <a href="#" data="{{ SITE_ROOT }}contacts/edit/?email={{ contact.contact_email }}" class="contact-edit op">{% trans "Edit"%}</a>
-            <a href="#" data-url="{{ SITE_ROOT }}contacts/delete/?email={{ contact.contact_email}}" data-target="{{ contact.contact_email}}" class="contact-delete op">{% trans "Delete"%}</a>
+            <a href="#" data-url="{{ SITE_ROOT }}contacts/delete/?email={{ contact.contact_email|quote}}" data-target="{{ contact.contact_email}}" class="contact-delete op">{% trans "Delete"%}</a>
         </td>
     </tr>
 {% endfor %}
diff --git a/organizations/urls.py b/organizations/urls.py
index 36b8ff0943..402de53f4c 100644
--- a/organizations/urls.py
+++ b/organizations/urls.py
@@ -19,7 +19,7 @@ urlpatterns = patterns('',
 
 
     # repo share
-    url(r'^(?P<url_prefix>[^/]+)/shareadmin/$', org_shareadmin, name='org_shareadmin'),
+    url(r'^(?P<url_prefix>[^/]+)/share/$', org_shareadmin, name='org_shareadmin'),
     url(r'^(?P<url_prefix>[^/]+)/repo/share/$', org_repo_share, name='org_repo_share'),
     url(r'^(?P<url_prefix>[^/]+)/share/permission_admin/$', org_share_permission_admin, name='org_share_permission_admin'),
                        
diff --git a/share/templates/repo/share_admin.html b/share/templates/repo/share_admin.html
index f46f7c87b6..ff9a62ad98 100644
--- a/share/templates/repo/share_admin.html
+++ b/share/templates/repo/share_admin.html
@@ -53,10 +53,10 @@
         <td>{{ repo.props.repo_desc }}</td>
         <td>
           {% if repo.props.share_type == 'group' %}
-          <a href="#" data="{% url 'repo_remove_share' %}?repo_id={{ repo.props.repo_id }}&from={{ request.user }}&gid={{ repo.props.group_id }}" class="cancel-share op">{% trans "Unshare"%}</a>
+          <a href="#" data="{% url 'repo_remove_share' %}?repo_id={{ repo.props.repo_id }}&from={{ request.user.username|quote }}&gid={{ repo.props.group_id }}" class="cancel-share op">{% trans "Unshare"%}</a>
 	  {% endif %}
           {% if repo.props.share_type == 'personal' %}
-          <a href="#" data="{% url 'repo_remove_share' %}?repo_id={{ repo.props.repo_id }}&from={{ request.user }}&to={{ repo.props.user }}" class="cancel-share op">{% trans "Unshare"%}</a>
+          <a href="#" data="{% url 'repo_remove_share' %}?repo_id={{ repo.props.repo_id }}&from={{ request.user.username|quote }}&to={{ repo.props.user|quote }}" class="cancel-share op">{% trans "Unshare"%}</a>
 	  {% endif %}
 	  {% if repo.props.share_type == 'public' %}
 	      {% if not org %}
diff --git a/share/views.py b/share/views.py
index e5e0fccfaf..20b2a49c92 100644
--- a/share/views.py
+++ b/share/views.py
@@ -146,7 +146,7 @@ def repo_remove_share(request):
     repo_id = request.GET.get('repo_id', '')
     group_id = request.GET.get('gid', '')
     from_email = request.GET.get('from', '')
-    
+
     # if request params don't have 'gid', then remove repos that share to
     # to other person; else, remove repos that share to groups
     if not group_id:
diff --git a/templates/org_base.html b/templates/org_base.html
index 2927ad3ed5..b45ab8bd6a 100644
--- a/templates/org_base.html
+++ b/templates/org_base.html
@@ -12,7 +12,7 @@
         <a href="{% url 'organizations.views.org_groups' org.url_prefix %}" {% block nav_group_class %}{% endblock %}>{% trans "Groups" %}</a>
     </li>
     <li>
-        <a href="{% url 'organizations.views.org_shareadmin' org.url_prefix %}" {% block nav_shareadmin_class %}{% endblock %}>{% trans "Share" %}</a>
+        <a href="{% url 'organizations.views.org_shareadmin' org.url_prefix %}" {% block nav_share_class %}{% endblock %}>{% trans "Share" %}</a>
     </li>
     <li>
         <a href="{% url 'organizations.views.org_public' org.url_prefix %}" {% block nav_org_class %}{% endblock %}>{% trans "Public Library" %}</a>
diff --git a/templates/snippets/my_owned_repos.html b/templates/snippets/my_owned_repos.html
index 1341e0fa1b..d0a21c337e 100644
--- a/templates/snippets/my_owned_repos.html
+++ b/templates/snippets/my_owned_repos.html
@@ -80,7 +80,7 @@
         <td>
             <img src="{{ MEDIA_URL }}img/download-20.png" data="{{ repo.repo_id }}" class="download-btn op-icon vh" title="{% trans "Download" %}" alt="{% trans "Download" %}" />
             {% if repo.share_type == 'personal' %}
-            <img src="{{ MEDIA_URL }}img/delete-20.png" data-url="{% url 'repo_remove_share' %}?repo_id={{ repo.repo_id }}&from={{ repo.user }}&to={{ request.user }}" data-target="{{repo.repo_name}}" class="unshare-btn op-icon vh" title="{% trans "Leave Share" %}" alt="{% trans "Leave Share" %}" />
+            <img src="{{ MEDIA_URL }}img/delete-20.png" data-url="{% url 'repo_remove_share' %}?repo_id={{ repo.repo_id }}&from={{ repo.user|quote }}&to={{ request.user.username|quote }}" data-target="{{repo.repo_name}}" class="unshare-btn op-icon vh" title="{% trans "Leave Share" %}" alt="{% trans "Leave Share" %}" />
             {% endif %}
         </td>
     </tr>