diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 17a9526a71..8d9eb3a0c1 100644
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -226,9 +226,8 @@ function create_document_link($document_data, $show_as_icon = false, $counter =
             $force_download_html = ($size==0)?'':'<a href="'.$forcedownload_link.'" style="float:right"'.$prevent_multiple_click.'>'.Display::return_icon($forcedownload_icon, get_lang('Download'), array(),ICON_SIZE_SMALL).'</a>';
         }
 
-        //copy files to users myfiles
-        
-        if (api_get_setting('users_copy_files') == 'true' && !api_is_anonymous()){
+        //Copy files to users myfiles        
+        if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('users_copy_files') == 'true' && !api_is_anonymous()){
             $copy_myfiles_link = ($filetype == 'file') ? api_get_self().'?'.api_get_cidreq().'&action=copytomyfiles&id='.$document_data['id'].$req_gid :api_get_self().'?'.api_get_cidreq();
 
             if ($filetype == 'file') {
diff --git a/main/document/document.php b/main/document/document.php
index d988ab521d..34a2c234b1 100644
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -200,8 +200,8 @@ switch ($action) {
         }
         break;
     case 'copytomyfiles':
-        // Copy a file to general my files user's
-        if (api_get_setting('users_copy_files') == 'true' && api_get_user_id() != 0 && !api_is_anonymous()) {
+        // Copy a file to general my files user's        
+        if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('users_copy_files') == 'true' && api_get_user_id() != 0 && !api_is_anonymous()) {
             $document_info = DocumentManager::get_document_data_by_id($_GET['id'], api_get_course_id(), true);
             $parent_id = $document_info['parent_id'];
             $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'system');
diff --git a/main/social/home.php b/main/social/home.php
index 62dc63aafb..70b3416b06 100644
--- a/main/social/home.php
+++ b/main/social/home.php
@@ -25,8 +25,7 @@ api_block_anonymous_users();
 if (api_get_setting('allow_social_tool') !='true' ) {
     $url = api_get_path(WEB_CODE_PATH).'auth/profile.php';
     header('Location: '.$url);
-    exit;
-    
+    exit;    
     api_not_allowed();
 }
 
diff --git a/main/social/myfiles.php b/main/social/myfiles.php
index e5b9f18e6d..9ae7209f05 100644
--- a/main/social/myfiles.php
+++ b/main/social/myfiles.php
@@ -12,6 +12,7 @@ $cidReset=true;
 require_once '../inc/global.inc.php';
 
 api_block_anonymous_users();
+
 if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
@@ -25,7 +26,7 @@ $interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('SocialNetwo
 $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyFiles'));
 
 $htmlHeadXtra[] = '
-<script type="text/javascript">
+<script>
 		
 function denied_friend (element_input) {
 	name_button=$(element_input).attr("id");
@@ -92,10 +93,8 @@ if (is_array($_GET) && count($_GET)>0) {
 }
 
 $social_left_content = SocialManager::show_social_menu('myfiles');
-if (isset($_GET['cidReq'])){
-	$social_right_content .='<div class="actions">';
-	$social_right_content .= '<a href="'.api_get_path(WEB_CODE_PATH).'document/document.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;id_session='.Security::remove_XSS($_GET['id_session']).'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&amp;id='.Security::remove_XSS($_GET['parent_id']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('Documents').' ('.get_lang('Course').')').get_lang('BackTo').' '.get_lang('Documents').' ('.get_lang('Course').')</a>';
-	$social_right_content .= '</div>';
+if (isset($_GET['cidReq'])){	
+	$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'document/document.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;id_session='.Security::remove_XSS($_GET['id_session']).'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&amp;id='.Security::remove_XSS($_GET['parent_id']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('Documents').' ('.get_lang('Course').')').'</a>';	
 }
 $social_right_content .=  '<div class="span9">';	
 $social_right_content .= '<iframe name="fileManager" id="fileManager" src="'.api_get_path(WEB_PATH).'main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php?editor=stand_alone" scrolling="no" noresize="noresize" frameborder="no" style="height:450px; width:100%; float:left"></iframe>';