diff --git a/group/views.py b/group/views.py
index d3aa90eb15..e1c1b6c738 100644
--- a/group/views.py
+++ b/group/views.py
@@ -36,10 +36,6 @@ def group_list(request):
         try:
             group_id = ccnet_threaded_rpc.create_group(group_name.encode('utf-8'),
                                    request.user.username)
-            # TODO: transaction?
-            if request.user.org and group_id > 0:
-                ccnet_threaded_rpc.add_org_group(request.user.org.org_id,
-                                        group_id)
         except SearpcError, e:
             error_msg = e.msg
             return render_error(request, error_msg)
diff --git a/organizations/utils.py b/organizations/utils.py
index 76f4d8cce4..3ae61ff72e 100644
--- a/organizations/utils.py
+++ b/organizations/utils.py
@@ -5,10 +5,9 @@ from seaserv import get_org_id_by_repo_id
 def access_org_repo(request, repo_id):
     """
     Check whether user can view org repo.
-    Arguments:
-    - `request`: request must has org dict.
-    - `repo_id`: repo id
     """
+    if not request.user.org:
+        return False
     cur_org_id = request.user.org['org_id']
     org_id = get_org_id_by_repo_id(repo_id)
     return True if cur_org_id == org_id else False