diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 773c7de6d6..80465feaeb 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -1063,6 +1063,7 @@ class SocialManager extends UserManager
                         </a>
                     </li>';
                 $links .= $personalData;
+
                 $links .= '</ul>';
             }
 
@@ -1087,7 +1088,7 @@ class SocialManager extends UserManager
         if ($show === 'shared_profile') {
             $links = '<ul class="nav nav-pills nav-stacked">';
             // My own profile
-            if ($show_full_profile && $user_id == intval(api_get_user_id())) {
+            if ($show_full_profile && $user_id == api_get_user_id()) {
                 $links .= '
                     <li class="home-icon '.$active.'">
                         <a href="'.api_get_path(WEB_CODE_PATH).'social/home.php">
@@ -1155,6 +1156,18 @@ class SocialManager extends UserManager
                         </li>
                     ';
                 }
+
+                if (!api_get_configuration_value('disable_gdpr')) {
+                    $active = $show == 'personal-data' ? 'active' : null;
+                    $personalData = '
+                    <li class="personal-data-icon '.$active.'">
+                        <a href="'.api_get_path(WEB_CODE_PATH).'social/personal_data.php">
+                            '.$personalDataIcon.' '.get_lang('PersonalDataReport').'
+                        </a>
+                    </li>';
+                    $links .= $personalData;
+                    $links .= '</ul>';
+                }
             }
 
             // My friend profile.
@@ -1220,7 +1233,7 @@ class SocialManager extends UserManager
                 'sn-sidebar-collapse'
             );
 
-            if ($show_full_profile && $user_id == intval(api_get_user_id())) {
+            if ($show_full_profile && $user_id == api_get_user_id()) {
                 $personal_course_list = UserManager::get_personal_session_course_list($user_id);
                 $course_list_code = [];
                 $i = 1;
@@ -1238,14 +1251,13 @@ class SocialManager extends UserManager
                 }
 
                 // Announcements
-                $my_announcement_by_user_id = intval($user_id);
                 $announcements = [];
                 foreach ($course_list_code as $course) {
                     $course_info = api_get_course_info($course['code']);
                     if (!empty($course_info)) {
                         $content = AnnouncementManager::get_all_annoucement_by_user_course(
                             $course_info['code'],
-                            $my_announcement_by_user_id
+                            $user_id
                         );
 
                         if (!empty($content)) {