diff --git a/seahub/api2/endpoints/groups.py b/seahub/api2/endpoints/groups.py
index 988ae6cf28..638fe2cb14 100644
--- a/seahub/api2/endpoints/groups.py
+++ b/seahub/api2/endpoints/groups.py
@@ -139,7 +139,14 @@ class Groups(APIView):
 
         # Group name is valid, create that group.
         try:
-            group_id = seaserv.ccnet_threaded_rpc.create_group(group_name, username)
+            if is_org_context(request):
+                org_id = request.user.org.org_id
+                group_id = seaserv.ccnet_threaded_rpc.create_org_group(org_id,
+                                                                       group_name,
+                                                                       username)
+            else:
+                group_id = seaserv.ccnet_threaded_rpc.create_group(group_name,
+                                                                   username)
         except SearpcError as e:
             logger.error(e)
             error_msg = _(u'Failed')