diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index d2699b967c..68e02cfcb0 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -442,12 +442,12 @@ if ($showWarningMessage) {
 SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
 if (api_get_setting('allow_social_tool') === 'true') {
     $tpl->assign('social_menu_block', $socialMenuBlock);
-    $tpl->assign('personal_data', $personalData);
 } else {
     $tpl->assign('social_menu_block', '');
     $tpl->assign('personal_data_block', $personalDataContent);
 }
 
+$tpl->assign('personal_data', $personalData);
 $tpl->assign('permission', $permissionBlock);
 $tpl->assign('term_link', $termLink);
 $socialLayout = $tpl->get_template('social/personal_data.tpl');
diff --git a/main/template/default/social/personal_data.tpl b/main/template/default/social/personal_data.tpl
index 06fbd4bbb2..999675369e 100644
--- a/main/template/default/social/personal_data.tpl
+++ b/main/template/default/social/personal_data.tpl
@@ -38,6 +38,7 @@
         </div>
         {% endif %}
         {% if personal_data.officer_name %}
+            {% set officer_data %}
             <div class="panel personal-data-responsible">
                 <div class="panel-title">{{ 'PersonalDataOfficerName' | get_lang }}</div>
                 <div class="personal-data-responsible-description">
@@ -48,6 +49,8 @@
                     {{ personal_data.officer_role }}
                 </div>
             </div>
+            {% endset %}
+            {{ display.panel('PersonalDataOfficer' | get_lang , officer_data ) }}
         {% endif %}
 
         {% if term_link %}