diff --git a/main/admin/career_dashboard.php b/main/admin/career_dashboard.php
index 82bbb4d081..4be21a91c2 100644
--- a/main/admin/career_dashboard.php
+++ b/main/admin/career_dashboard.php
@@ -6,11 +6,8 @@ $language_file = array('courses', 'index', 'admin');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-require_once $libpath.'course.lib.php';
-//require_once $libpath.'usermanager.lib.php';
 require_once $libpath.'career.lib.php';
 require_once $libpath.'promotion.lib.php';
-require_once $libpath.'sessionmanager.lib.php';
 require_once $libpath.'formvalidator/FormValidator.class.php';
 
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
@@ -30,8 +27,6 @@ $interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('Car
 
 Display :: display_header($nameTools);
 
-
-
 $form = new FormValidator('filter_form','GET', api_get_self());
 
 $career = new Career();
@@ -52,7 +47,7 @@ foreach ($careers as $item) {
     $career_select_list[$item['id']] = $item['name'];
 }
 
-$form->addElement('select', 'filter', get_lang('Career'), $career_select_list);
+$form->addElement('select', 'filter', get_lang('Career'), $career_select_list, array('id'=>'filter_1', 'class'=>'chzn-select'));
 $form->addElement('style_submit_button', 'submit', get_lang('Filter'), 'class="search"');
 
 
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index df42b91865..ec83aafc94 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -12,7 +12,6 @@ require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
 require_once $libpath.'fileManage.lib.php';
 require_once $libpath.'fileUpload.lib.php';
-require_once $libpath.'usermanager.lib.php';
 require_once $libpath.'formvalidator/FormValidator.class.php';
 require_once $libpath.'mail.lib.inc.php';
 
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index 84def1b768..d7cfca327f 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -53,7 +53,6 @@ function show_image(image,width,height) {
 $libpath = api_get_path(LIBRARY_PATH);
 require_once $libpath.'fileManage.lib.php';
 require_once $libpath.'fileUpload.lib.php';
-require_once $libpath.'usermanager.lib.php';
 require_once $libpath.'formvalidator/FormValidator.class.php';
 require_once $libpath.'mail.lib.inc.php';
 
diff --git a/main/admin/user_import.php b/main/admin/user_import.php
index da7508a7ae..770b5898aa 100755
--- a/main/admin/user_import.php
+++ b/main/admin/user_import.php
@@ -267,7 +267,6 @@ function parse_xml_data($file) {
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
 require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'classmanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'import.lib.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index b1b7c1f474..22a163e31e 100755
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -886,8 +886,7 @@ function store_add_dropbox() {
 	$b_send_mail = api_get_course_setting('email_alert_on_new_doc_dropbox');
 
 	if ($b_send_mail) {
-		foreach ($new_work_recipients as $recipient_id) {
-			require_once api_get_path(LIBRARY_PATH) . 'usermanager.lib.php' ;
+		foreach ($new_work_recipients as $recipient_id) {			
 			$recipent_temp = UserManager :: get_user_info_by_id($recipient_id);
 			@api_mail(api_get_person_name($recipent_temp['firstname'].' '.$recipent_temp['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), $recipent_temp['email'],
 				get_lang('NewDropboxFileUploaded'),
diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index 150c8ec1b8..5a252f4c52 100755
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -38,7 +38,7 @@ require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
 require_once 'hotpotatoes.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'document.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH) . 'usermanager.lib.php';
+
 
 /*	Constants and variables */
 $is_allowedToEdit 			= api_is_allowed_to_edit(null,true);
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index a1946da0e9..feee1234fa 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -3010,7 +3010,6 @@ class Exercise {
 
 		$url_email = api_get_path(WEB_CODE_PATH).'exercice/exercice.php?'.api_get_cidreq().'&id_session='.api_get_session_id().'&show=result&exerciseId='.$this->id;
 
-		require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 		$user_info = UserManager::get_user_info_by_id(api_get_user_id());
 
 		if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
diff --git a/main/exercice/exercise_history.php b/main/exercice/exercise_history.php
index 28e9517a76..0dee37e1f5 100755
--- a/main/exercice/exercise_history.php
+++ b/main/exercice/exercise_history.php
@@ -27,7 +27,6 @@ $show=(isset($_GET['show']) && $_GET['show'] == 'result')?'result':'test'; // mo
 
 require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 //include(api_get_path(LIBRARY_PATH).'mail.lib.inc.php');
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
 /* 	Constants and variables */
 $is_allowedToEdit = api_is_allowed_to_edit(null,true);
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index fa370feb08..dfeb877f78 100755
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -25,7 +25,6 @@
  * code
  */
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
 
 get_notifications_of_user();
diff --git a/main/gradebook/gradebook.php b/main/gradebook/gradebook.php
index 8170dd6e85..369e7e7e3c 100755
--- a/main/gradebook/gradebook.php
+++ b/main/gradebook/gradebook.php
@@ -33,7 +33,6 @@ require_once 'lib/fe/gradebooktable.class.php';
 require_once 'lib/fe/displaygradebook.php';
 require_once 'lib/fe/userform.class.php';
 require_once api_get_path(LIBRARY_PATH).'document.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
diff --git a/main/gradebook/gradebook_view_result.php b/main/gradebook/gradebook_view_result.php
index 6253ddf835..19345517ae 100755
--- a/main/gradebook/gradebook_view_result.php
+++ b/main/gradebook/gradebook_view_result.php
@@ -20,7 +20,6 @@ require_once 'lib/fe/dataform.class.php';
 require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
-require_once api_get_path(LIBRARY_PATH) . 'usermanager.lib.php';
 require_once 'lib/results_data_generator.class.php';
 require_once 'lib/fe/resulttable.class.php';
 require_once 'lib/fe/exportgradebook.php';
diff --git a/main/gradebook/user_info.php b/main/gradebook/user_info.php
index 0227ee24e1..28583a520c 100755
--- a/main/gradebook/user_info.php
+++ b/main/gradebook/user_info.php
@@ -13,7 +13,6 @@ require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
-require_once api_get_path(LIBRARY_PATH) . 'usermanager.lib.php';
 api_block_anonymous_users();
 
 if (isset($_GET['userid'])) {
diff --git a/main/gradebook/user_stats.php b/main/gradebook/user_stats.php
index 58757606d7..5c322e7376 100755
--- a/main/gradebook/user_stats.php
+++ b/main/gradebook/user_stats.php
@@ -19,8 +19,6 @@ require_once 'lib/fe/usertable.class.php';
 require_once 'lib/fe/displaygradebook.php';
 require_once 'lib/scoredisplay.class.php';
 
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-
 api_block_anonymous_users();
 block_students();
 
diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php
index 0465e506e7..905e45601e 100755
--- a/main/inc/ajax/user_manager.ajax.php
+++ b/main/inc/ajax/user_manager.ajax.php
@@ -5,7 +5,6 @@
  */
 $language_file = array('admin', 'registration');
 require_once '../global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 $action = $_GET['a'];
 
 switch ($action) {	
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index 91250b573d..91316fb455 100755
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -2165,10 +2165,7 @@ class Blog {
 		}
 		$column_header[] = array (get_lang('Email'), true, '');
 		$column_header[] = array (get_lang('Register'), false, '');
-
-		include_once (api_get_path(LIBRARY_PATH)."/course.lib.php");
-		include_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
-
+		
 		if(isset($_SESSION['session_id'])){
 			$session_id = intval($_SESSION['session_id']);
 		}
diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php
index d1082236c3..93b33dba87 100755
--- a/main/mySpace/teachers.php
+++ b/main/mySpace/teachers.php
@@ -9,8 +9,6 @@ $cidReset = true;
 
 require_once '../inc/global.inc.php';
 require_once 'myspace.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'tracking.lib.php';
 
 $this_section = SECTION_TRACKING;
 
diff --git a/main/mySpace/user_add.php b/main/mySpace/user_add.php
index c474a6bd6c..8fbddf3779 100755
--- a/main/mySpace/user_add.php
+++ b/main/mySpace/user_add.php
@@ -10,7 +10,6 @@ require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
 require_once $libpath.'fileManage.lib.php';
 require_once $libpath.'fileUpload.lib.php';
-require_once $libpath.'usermanager.lib.php';
 require_once $libpath.'formvalidator/FormValidator.class.php';
 require_once $libpath.'mail.lib.inc.php';
 
diff --git a/main/mySpace/user_import.php b/main/mySpace/user_import.php
index 3268ad22ca..4cd9c0ce9a 100755
--- a/main/mySpace/user_import.php
+++ b/main/mySpace/user_import.php
@@ -19,7 +19,6 @@ require_once 'myspace.lib.php';
 $this_section = SECTION_PLATFORM_ADMIN; // TODO: Platform admin section?
 
 require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'classmanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'import.lib.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
diff --git a/main/wiki/index.php b/main/wiki/index.php
index 311a618296..164b43ed4e 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -1942,8 +1942,7 @@ if ($_GET['action']=='discuss') {
                 } else {
                     $author_status=get_lang('Teacher');
                 }
-
-                require_once api_get_path(INCLUDE_PATH).'/lib/usermanager.lib.php';
+                
                 $user_id=$row['userc_id'];
                 $name = api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
                 $attrb=array();
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 6c8d23f45a..1161a6fbe2 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -1813,8 +1813,7 @@ function auto_add_page_users($assignment_type) {
 
     //data about teacher
     $userinfo=Database::get_user_info_from_id(api_get_user_id());
-    $name = api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
-    require_once api_get_path(INCLUDE_PATH).'/lib/usermanager.lib.php';
+    $name = api_get_person_name($userinfo['firstname'], $userinfo['lastname']);    
     if (api_get_user_id()<>0) {
         $image_path = UserManager::get_user_picture_path_by_id(api_get_user_id(),'web',false, true);
         $image_repository = $image_path['dir'];