diff --git a/main/social/profile.php b/main/social/profile.php
index d5d020fa30..9088d58063 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -113,7 +113,6 @@ if ($user_info['user_id'] == api_get_user_id()) {
 $userIsOnline = user_is_online($user_id);
 
 $libpath = api_get_path(LIBRARY_PATH);
-require_once api_get_path(SYS_CODE_PATH).'calendar/myagenda.inc.php';
 
 require_once $libpath.'magpierss/rss_fetch.inc';
 $ajax_url = api_get_path(WEB_AJAX_PATH).'message.ajax.php';
@@ -737,8 +736,8 @@ $tpl->assign('social_group_info_block', $social_group_info_block);
 $tpl->assign('social_rss_block', $social_rss_block);
 $tpl->assign('social_skill_block', $social_skill_block);
 $tpl->assign('social_session_block', $social_session_block);
-$tpl->assign('socialRightInformation', $socialRightInformation);
-$tpl->assign('socialAutoExtendLink', $socialAutoExtendLink);
+$tpl->assign('social_right_information', $socialRightInformation);
+$tpl->assign('social_auto_extend_link', $socialAutoExtendLink);
 
 $formModalTpl =  new Template();
 $formModalTpl->assign('messageForm', MessageManager::generate_message_form('send_message'));
diff --git a/main/template/default/social/add_groups.tpl b/main/template/default/social/add_groups.tpl
index e0dc7ed61a..e798efcf17 100644
--- a/main/template/default/social/add_groups.tpl
+++ b/main/template/default/social/add_groups.tpl
@@ -15,15 +15,15 @@
             </div>
         </div>
         <div class="row">
-            {{ social_right_content}}
+            {{ social_right_content }}
         </div>
         <div id="display_response_id" class="col-md-5"></div>
-        {{ socialAutoExtendLink }}
+        {{ social_auto_extend_link }}
     </div>
     <div class="col-md-4">
         <div class="row">
-            {{ socialRightInformation}}
+            {{ social_right_information }}
         </div>
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/default/social/friends.tpl b/main/template/default/social/friends.tpl
index 9fd70c2362..f61e5303df 100644
--- a/main/template/default/social/friends.tpl
+++ b/main/template/default/social/friends.tpl
@@ -18,12 +18,12 @@
             {{ social_right_content}}
         </div>
         <div id="display_response_id" class="span5"></div>
-        {{ socialAutoExtendLink }}
+        {{ social_auto_extend_link }}
     </div>
     <div class="col-md-4">
         <div class="row">
-            {{ socialRightInformation}}
+            {{ social_right_information }}
         </div>
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/default/social/groups.tpl b/main/template/default/social/groups.tpl
index e0dc7ed61a..e798efcf17 100644
--- a/main/template/default/social/groups.tpl
+++ b/main/template/default/social/groups.tpl
@@ -15,15 +15,15 @@
             </div>
         </div>
         <div class="row">
-            {{ social_right_content}}
+            {{ social_right_content }}
         </div>
         <div id="display_response_id" class="col-md-5"></div>
-        {{ socialAutoExtendLink }}
+        {{ social_auto_extend_link }}
     </div>
     <div class="col-md-4">
         <div class="row">
-            {{ socialRightInformation}}
+            {{ social_right_information }}
         </div>
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/default/social/home.tpl b/main/template/default/social/home.tpl
index 1109292d3a..ac881c5398 100644
--- a/main/template/default/social/home.tpl
+++ b/main/template/default/social/home.tpl
@@ -15,10 +15,10 @@
             {{ social_group_block }}
             <div id="message_ajax_reponse" class=""></div>
             <div id="display_response_id"></div>
-            {{ socialAutoExtendLink }}
+            {{ social_auto_extend_link }}
         </div>
         <div class="col-md-3">
 
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/default/social/myfiles.tpl b/main/template/default/social/myfiles.tpl
index 8b5670c5ba..6bbbd12d5a 100644
--- a/main/template/default/social/myfiles.tpl
+++ b/main/template/default/social/myfiles.tpl
@@ -15,10 +15,10 @@
             </div>
         </div>
         <div class="row">
-            {{ social_right_content}}
+            {{ social_right_content }}
         </div>
         <div id="display_response_id" class="col-md-12"></div>
-        {{ socialAutoExtendLink }}
+        {{ social_auto_extend_link }}
     </div>
 </div>
 {% endblock %}
diff --git a/main/template/default/social/profile.tpl b/main/template/default/social/profile.tpl
index c94b46eb5a..9189d411ca 100644
--- a/main/template/default/social/profile.tpl
+++ b/main/template/default/social/profile.tpl
@@ -12,28 +12,18 @@
     <div id="wallMessages" class="col-md-6">
         {{ social_wall_block }}
         {{ social_post_wall_block }}
-        {{ socialAutoExtendLink }}
-       <!-- <div class="row">
-            <div class="span5">
-                <div id="message_ajax_reponse" class=""></div>
-            </div>
-        </div> -->
-
-       <!--- <div id="display_response_id" class="span5"></div> -->
-
+        {{ social_auto_extend_link }}
     </div>
     <div class="col-md-3">
-
-            {{ social_skill_block }}
-            {{ social_group_info_block }}
-            {{ social_course_block }}
-            {{ social_session_block }}
-            {{ social_rss_block }}
-            {{ socialRightInformation}}
-
+        {{ social_skill_block }}
+        {{ social_group_info_block }}
+        {{ social_course_block }}
+        {{ social_session_block }}
+        {{ social_rss_block }}
+        {{ social_right_information }}
     </div>
 </div>
     {% if formModals is defined %}
         {{ formModals }}
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}