diff --git a/main/social/response.inc.php b/main/social/response.inc.php
deleted file mode 100755
index 38776e54b3..0000000000
--- a/main/social/response.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/*
- * Created on 22/01/2009
- *
- * To change the template for this generated file go to
- * Window - Preferences - PHPeclipse - PHP - Code Templates
- */
-?>
-<input type="button" class="button" name="btn_2" id="btn_2" value="value" />
\ No newline at end of file
diff --git a/main/social/select_options.php b/main/social/select_options.php
index 54a4832a27..c248edd9a3 100755
--- a/main/social/select_options.php
+++ b/main/social/select_options.php
@@ -8,10 +8,11 @@ $tbl_my_user = Database :: get_main_table(TABLE_MAIN_USER);
 $tbl_my_user_friend = Database :: get_main_table(TABLE_MAIN_USER_FRIEND);
 $search=$_POST['search'];
 $html_form='<select id="id_search_name" name="id_search_name" size="8"" class="message-select-box">';
-$sql='SELECT DISTINCT u.user_id as id,concat(u.firstname," ",u.lastname," ","( ",u.email," )") as name FROM '.$tbl_my_user.' u
-	INNER JOIN '.$track_online_table.' t
-	ON u.user_id=t.login_user_id INNER JOIN '.$tbl_my_user_friend.' uf
-	ON uf.friend_user_id=u.user_id ;';
+$sql='SELECT DISTINCT u.user_id as id,concat(u.firstname," ",u.lastname," ","( ",u.email," )") as name
+FROM '.$tbl_my_user.' u INNER JOIN '.$track_online_table.' t ON u.user_id=t.login_user_id';
+if (api_get_setting('allow_social_tool')=='true') {
+	$sql.='INNER JOIN '.$tbl_my_user_friend.' uf ON uf.friend_user_id=u.user_id ';
+}  
 $res=api_sql_query($sql,__FILE__,__LINE__);
 while ($row=Database::fetch_array($res,'ASSOC')) {
 	$html_form.='<option value="'.$row['id'].'">'.$row['name'].'</option>';