diff --git a/seahub/base/accounts.py b/seahub/base/accounts.py
index 9382329be3..88ffcd8411 100644
--- a/seahub/base/accounts.py
+++ b/seahub/base/accounts.py
@@ -10,10 +10,12 @@ from seahub.auth.models import get_hexdigest
 from seahub.auth import login
 from registration import signals
 #from registration.forms import RegistrationForm
-from seaserv import ccnet_threaded_rpc, unset_repo_passwd, is_passwd_set
+from seaserv import ccnet_threaded_rpc, unset_repo_passwd, is_passwd_set, \
+    seafile_api
 
 from seahub.profile.models import Profile, DetailedProfile
-from seahub.utils import is_valid_username, is_user_password_strong
+from seahub.utils import is_valid_username, is_user_password_strong, \
+    clear_token
 try:
     from seahub.settings import CLOUD_MODE
 except ImportError:
@@ -172,12 +174,24 @@ class User(object):
         """
         When delete user, we should also delete group relationships.
         """
-        # TODO: what about repos and groups?
         if self.source == "DB":
             source = "DB"
         else:
             source = "LDAP"
 
+        owned_repos = []
+        orgs = ccnet_threaded_rpc.get_orgs_by_user(self.username)
+        if orgs:
+            for org in orgs:
+                owned_repos += seafile_api.get_org_owned_repo_list(org.org_id,
+                                                                   self.username)
+        else:
+            owned_repos += seafile_api.get_owned_repo_list(self.username)
+
+        for r in owned_repos:
+            seafile_api.remove_repo(r.id)
+
+        clear_token(self.username)
         ccnet_threaded_rpc.remove_emailuser(source, self.username)
         Profile.objects.delete_profile_by_user(self.username)
 
diff --git a/seahub/profile/views.py b/seahub/profile/views.py
index c66def4b00..3cde06e8cf 100644
--- a/seahub/profile/views.py
+++ b/seahub/profile/views.py
@@ -15,8 +15,7 @@ from forms import DetailedProfileForm
 from models import Profile, DetailedProfile
 from utils import refresh_cache
 from seahub.auth.decorators import login_required
-from seahub.utils import is_org_context, clear_token, is_pro_version, \
-    is_valid_username
+from seahub.utils import is_org_context, is_pro_version, is_valid_username
 from seahub.base.accounts import User
 from seahub.base.templatetags.seahub_tags import email2nickname
 from seahub.contacts.models import Contact
@@ -159,7 +158,6 @@ def delete_user_account(request):
 
     user = User.objects.get(email=username)
     user.delete()
-    clear_token(username)
 
     if is_org_context(request):
         org_id = request.user.org.org_id
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index cd60ae4c15..1db9fc6a36 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -738,7 +738,6 @@ def user_remove(request, email):
                 seafile_api.remove_repo(repo.id)
 
         user.delete()
-        clear_token(user.email)
         messages.success(request, _(u'Successfully deleted %s') % user.username)
     except User.DoesNotExist:
         messages.error(request, _(u'Failed to delete: the user does not exist'))