diff --git a/seahub/templates/sysadmin/sys_admin_group_info.html b/seahub/templates/sysadmin/sys_admin_group_info.html
index d0691ba9b8..599b6b3eea 100644
--- a/seahub/templates/sysadmin/sys_admin_group_info.html
+++ b/seahub/templates/sysadmin/sys_admin_group_info.html
@@ -45,7 +45,13 @@
 
             {% for repo in repos %}
             <tr>
-                <td><img src="{{MEDIA_URL}}img/sync-folder-20.png?t=1387267140" title="{% trans "Read-Write" %}" alt="{% trans "directory icon" %}" /></td>
+                {% if repo.encrypted %}
+                <td><img src="{{MEDIA_URL}}img/sync-folder-encrypt-20.png" title="{% trans "Encrypted"%}" alt="{% trans "library icon" %}" /></td>
+                {% elif repo.permission == 'r' %}
+                <td><img src="{{MEDIA_URL}}img/folder-no-write-20.png" title="{% trans "Read-Only"%}" alt="{% trans "library icon" %}" /></td>
+                {% else %}
+                <td><img src="{{MEDIA_URL}}img/sync-folder-20.png?t=1387267140" title="{% trans "Read-Write" %}" alt="{% trans "library icon" %}" /></td>
+                {% endif %}
                 <td><a href="{% url 'view_common_lib_dir' repo.id '' %}">{{ repo.name }}</a></td>
                 <td>{{ repo.size|filesizeformat }}</td>
                 <td><a href="{% url 'user_info' repo.user %}">{{ repo.user }}</a></td>
diff --git a/seahub/templates/sysadmin/sys_group_admin.html b/seahub/templates/sysadmin/sys_group_admin.html
index 7e93fa74cf..7a339e4900 100644
--- a/seahub/templates/sysadmin/sys_group_admin.html
+++ b/seahub/templates/sysadmin/sys_group_admin.html
@@ -17,9 +17,11 @@
     {% for group in groups %}
     <tr>
         <td>
-            <a href="{% url 'sys_admin_group_info' group.id %}">{{ group.props.group_name }}</a>
-            {% if group.org_name %}
+            {% if group.org_id %}
+            <a href="{% url 'sys_admin_group_info' group.id %}?org_id={{group.org_id}}">{{ group.props.group_name }}</a>
             <p style="font-size:11px;"><a href="{% url 'sys_org_info_user' group.org_id %}">({{group.org_name}})</a></p>
+            {% else %}
+            <a href="{% url 'sys_admin_group_info' group.id %}">{{ group.props.group_name }}</a>
             {% endif %}
         </td>
         <td>{{ group.props.creator_name }}</td>
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 1db9fc6a36..5a9ddfb632 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -1078,7 +1078,11 @@ def sys_admin_group_info(request, group_id):
 
     group_id = int(group_id)
     group = get_group(group_id)
-    repos = seafile_api.get_repos_by_group(group_id)
+    org_id = request.GET.get('org_id', None)
+    if org_id:
+        repos = seafile_api.get_org_group_repos(org_id, group_id)
+    else:
+        repos = seafile_api.get_repos_by_group(group_id)
     members = get_group_members(group_id)
 
     return render_to_response('sysadmin/sys_admin_group_info.html', {