diff --git a/main/document/document.php b/main/document/document.php
index f14950ec5c..185ef3818e 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -873,13 +873,13 @@ Session::write('image_files_only', '');
 $image_files_only = '';
 if ($is_certificate_mode) {
     $interbreadcrumb[] = array(
-        'url' => '../gradebook/index.php',
+        'url' => '../gradebook/index.php?'.api_get_cidreq(),
         'name' => get_lang('Gradebook')
     );
 } else {
     if ((isset($_GET['id']) && $_GET['id'] != 0) || isset($_GET['curdirpath']) || isset($_GET['createdir'])) {
         $interbreadcrumb[] = array(
-            'url' => 'document.php',
+            'url' => 'document.php?'.api_get_cidreq(),
             'name' => get_lang('Documents')
         );
     } else {
@@ -1349,7 +1349,7 @@ if ($isAllowedToEdit ||
                 $courseInfo,
                 api_get_user_id(),
                 $sessionId,
-                $groupIid,
+                api_get_group_id(),
                 $to_user_id,
                 $base_work_dir,
                 $dir_name,
diff --git a/main/upload/upload.document.php b/main/upload/upload.document.php
index faa9e3cdf6..1aaca771f4 100755
--- a/main/upload/upload.document.php
+++ b/main/upload/upload.document.php
@@ -102,7 +102,7 @@ if (isset($_POST['submit_image'])) {
             $_course,
             api_get_user_id(),
             api_get_session_id(),
-            $to_group_id,
+            api_get_group_id(),
             $to_user_id,
             $base_work_dir,
             $img_directory