diff --git a/media/css/seahub.css b/media/css/seahub.css
index e0ce6986e5..8c3a41f82c 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -148,4 +148,4 @@ div.home-page h2 { font-style: italic; }
 
 #id_repo_id { width:300px; }
 
-span.role-remove-link { font-size: 9px; }
\ No newline at end of file
+span.small-action-link { font-size: 9px; }
\ No newline at end of file
diff --git a/templates/useradmin.html b/templates/useradmin.html
index 0d77f502f3..ea6dd6bb98 100644
--- a/templates/useradmin.html
+++ b/templates/useradmin.html
@@ -6,7 +6,7 @@
 <table class="user-list default">
     <tr>
         <th>邮件</th>
-        <td>激活</td>
+        <td>是否激活</td>
         <td>Ccnet ID</td>
         <td>角色</td>
         <td>操作</td>
@@ -15,12 +15,16 @@
     {% for user in users %}
     <tr>
         <td>{{ user.email }}</td>
-        <td>{{ user.is_active }}</td>
+        <td>{{ user.is_active }}
+            {% if not user.is_active %}
+            <span class="small-action-link">(<a href="{{ SITE_ROOT }}useradmin/activate/{{ user.id }}/">激活</a>)</span> 
+            {% endif %}
+        </td>
         {% if user.profile %}
         <td>{{ user.profile.ccnet_user_id }}</td>
         <td>
             {% for role in user.role_list %}
-            {{ role }}<span class="role-remove-link">(<a href="{{ SITE_ROOT }}useradmin/{{ user.profile.ccnet_user_id }}/role/remove/?role={{ role }}">删除</a>)</span> 
+            {{ role }}<span class="small-action-link">(<a href="{{ SITE_ROOT }}useradmin/{{ user.profile.ccnet_user_id }}/role/remove/?role={{ role }}">删除</a>)</span> 
             {% endfor %}
         </td>
         <td><button class="add-role-btn" userid="{{ user.profile.ccnet_user_id }}" email="{{ user.email }}">添加角色</button></td>
diff --git a/urls.py b/urls.py
index 0f770b11e2..9458b3f0d8 100644
--- a/urls.py
+++ b/urls.py
@@ -4,7 +4,7 @@ from django.views.generic.simple import direct_to_template
 
 from seahub.views import root, peers, groups, myhome, \
     repo, group, modify_token, remove_repo, seafadmin, useradmin, \
-    role_add, role_remove
+    role_add, role_remove, activate_user
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
@@ -34,6 +34,7 @@ urlpatterns = patterns('',
     (r'^useradmin/$', useradmin),
     (r'^useradmin/(?P<user_id>[^/]+)/role/add/$', role_add),
     (r'^useradmin/(?P<user_id>[^/]+)/role/remove/$', role_remove),
+    (r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user),
     (r'^avatar/', include('avatar.urls')),
     (r'^profile/', include('seahub.profile.urls')),
 
diff --git a/views.py b/views.py
index a5172e4758..e95f6bf024 100644
--- a/views.py
+++ b/views.py
@@ -223,3 +223,22 @@ def role_remove(request, user_id):
         ccnet_rpc.remove_role(user_id, role)
 
     return HttpResponseRedirect(request.META['HTTP_REFERER'])
+
+
+@login_required
+def activate_user(request, user_id):
+    """The user id is django user id."""
+
+    if not request.user.is_staff:
+        raise Http404
+
+    try:
+        user = User.objects.get(pk=user_id)
+        user.is_active = True
+        user.save()
+    except User.DoesNotExist:
+        pass
+
+    return HttpResponseRedirect(request.META['HTTP_REFERER'])
+    
+