diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php
index a1f4cea50b..0edfe25e99 100755
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
@@ -230,7 +230,12 @@ if ($display_all_form) {
 
     //	LANGUAGE
     if (api_get_setting('registration', 'language') == 'true') {
-        $form->addElement('select_language', 'language', get_lang('Language'), '', array('disabled' => 'disabled'));
+        $form->addSelectLanguage(
+            'language',
+            get_lang('Language'),
+            '',
+            array('disabled' => 'disabled')
+        );
     }
 
     //	STUDENT/TEACHER
diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index f10390fa9e..3dc5dcb695 100755
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -106,14 +106,12 @@ if (count($languages['name']) === 1) {
     // If there's only one language available, there's no point in asking
     $form->addElement('hidden', 'course_language', $languages['folder'][0]);
 } else {
-    $form->addElement(
-        'select_language',
+    $form->addSelectLanguage(
         'course_language',
         get_lang('Ln'),
         array(),
         array('style' => 'width:150px')
     );
-    $form->applyFilter('select_language', 'html_filter');
 }
 
 if (api_get_setting('teacher_can_select_course_template') === 'true') {
diff --git a/main/admin/course_edit.php b/main/admin/course_edit.php
index a1d611f451..36fb142b93 100755
--- a/main/admin/course_edit.php
+++ b/main/admin/course_edit.php
@@ -197,8 +197,7 @@ $form->addText('department_url', get_lang('CourseDepartmentURL'), false, array('
 $form->applyFilter('department_url', 'html_filter');
 $form->applyFilter('department_url', 'trim');
 
-$form->addElement('select_language', 'course_language', get_lang('CourseLanguage'));
-$form->applyFilter('select_language', 'html_filter');
+$form->addSelectLanguage('course_language', get_lang('CourseLanguage'));
 
 $group = array();
 $group[]= $form->createElement('radio', 'visibility', get_lang("CourseAccess"), get_lang('OpenToTheWorld'), COURSE_VISIBILITY_OPEN_WORLD);
diff --git a/main/admin/course_list.php b/main/admin/course_list.php
index 06cf2ac6a0..7a8c900f32 100755
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
@@ -319,7 +319,7 @@ if (isset ($_GET['search']) && $_GET['search'] === 'advanced') {
         )
     );
 
-    $el = $form->addElement('select_language', 'keyword_language', get_lang('CourseLanguage'));
+    $el = $form->addSelectLanguage('keyword_language', get_lang('CourseLanguage'));
     $el->addOption(get_lang('All'), '%');
     $form->addElement('radio', 'keyword_visibility', get_lang("CourseAccess"), get_lang('OpenToTheWorld'), COURSE_VISIBILITY_OPEN_WORLD);
     $form->addElement('radio', 'keyword_visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
diff --git a/main/admin/course_request_edit.php b/main/admin/course_request_edit.php
index 6b25440688..d2ca1f8958 100755
--- a/main/admin/course_request_edit.php
+++ b/main/admin/course_request_edit.php
@@ -84,8 +84,7 @@ if ($course_validation_feature) {
         $form->addRule('target_audience', get_lang('ThisFieldIsRequired'), 'required');
 
         // Course language.
-        $form->addElement('select_language', 'course_language', get_lang('Ln'));
-        $form->applyFilter('select_language', 'html_filter');
+        $form->addSelectLanguage('course_language', get_lang('Ln'));
 
         // Exemplary content checkbox.
         $form->addElement('checkbox', 'exemplary_content', get_lang('FillWithExemplaryContent'));
diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index 7eb10d982c..37d6689123 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -137,7 +137,7 @@ if (isset($_POST['language'])) {
     $form->addElement('html', $buttons);
 
 } else {
-	$form->addElement('select_language', 'language', get_lang('Language'),null,array());
+    $form->addSelectLanguage('language', get_lang('Language'), null, array());
 	$form->addButtonSearch(get_lang('Load'), 'send');
 
 }
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index eed52b3d87..ea734c8802 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -265,7 +265,7 @@ if (api_is_platform_admin()) {
     $form->addElement('html', '</div>');
 }
 
-$form->addElement('select_language', 'language', get_lang('Language'), null);
+$form->addSelectLanguage('language', get_lang('Language'), null);
 
 // Send email
 $group = array();
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index c0ce32091e..0ed4a4954a 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -269,7 +269,7 @@ if (api_is_platform_admin()) {
 }
 
 //Language
-$form->addElement('select_language', 'language', get_lang('Language'));
+$form->addSelectLanguage('language', get_lang('Language'));
 
 // Send email
 $group = array();
diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 319d004fcc..b60d9a1ee9 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -205,8 +205,7 @@ if ($user_already_registered_show_terms === false) {
     // Language
     if (in_array('language', $allowedFields)) {
         if (api_get_setting('registration', 'language') == 'true') {
-            $form->addElement(
-                'select_language',
+            $form->addSelectLanguage(
                 'language',
                 get_lang('Language')
             );
diff --git a/main/auth/profile.php b/main/auth/profile.php
index 1e6a503d78..d8ede3b78e 100755
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -225,7 +225,7 @@ if (is_profile_editable() && api_get_setting('profile', 'picture') == 'true') {
 }
 
 //    LANGUAGE
-$form->addElement('select_language', 'language', get_lang('Language'));
+$form->addSelectLanguage('language', get_lang('Language'));
 if (api_get_setting('profile', 'language') !== 'true') {
     $form->freeze('language');
 }
diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index 10d5971148..30395db69e 100755
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@@ -140,7 +140,10 @@ $form->addElement(
     $categories,
     ['style'=>'width:350px', 'id'=>'category_code']
 );
-$form->addElement('select_language', 'course_language', array(get_lang('Ln'), get_lang('TipLang')));
+$form->addSelectLanguage(
+    'course_language',
+    array(get_lang('Ln'), get_lang('TipLang'))
+);
 
 $group = array(
     $form->createElement('radio', 'show_course_in_user_language', null, get_lang('Yes'), 1),
diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php
index 4548829bf0..7646dcc7b0 100755
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@@ -147,14 +147,12 @@ if (count($languages['name']) === 1) {
     // If there's only one language available, there's no point in asking
     $form->addElement('hidden', 'course_language', $languages['folder'][0]);
 } else {
-    $form->addElement(
-        'select_language',
+    $form->addSelectLanguage(
         'course_language',
         get_lang('Ln'),
         array(),
         array('style' => 'width:150px')
     );
-    $form->applyFilter('select_language', 'html_filter');
 }
 
 // Exemplary content checkbox.
diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
index e39d4b9404..8f50df73e9 100755
--- a/main/exercise/exercise.class.php
+++ b/main/exercise/exercise.class.php
@@ -2276,7 +2276,7 @@ class Exercise
                 require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
 
                 $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
-                $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
+                $form->addSelectLanguage('language', get_lang('SearchFeatureDocumentLanguage'));
 
                 $specific_fields = get_specific_field_list();
 
diff --git a/main/survey/fillsurvey.php b/main/survey/fillsurvey.php
index 80a9239469..53303cede5 100755
--- a/main/survey/fillsurvey.php
+++ b/main/survey/fillsurvey.php
@@ -466,7 +466,7 @@ if ($survey_data['form_fields'] != '' &&
 
     if (isset($list['language']) && $list['language'] == 1) {
         // LANGUAGE
-        $form->addElement('select_language', 'language', get_lang('Language'));
+        $form->addSelectLanguage('language', get_lang('Language'));
         if (api_get_setting('profile', 'language') !== 'true') {
             $form->freeze('language');
         }
diff --git a/main/upload/upload_ppt.php b/main/upload/upload_ppt.php
index 89301fe9af..142c337bf0 100755
--- a/main/upload/upload_ppt.php
+++ b/main/upload/upload_ppt.php
@@ -85,7 +85,7 @@ if (api_get_setting('search_enabled') === 'true') {
     require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
     $specific_fields = get_specific_field_list();
     $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument'));
-    $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage'));
+    $form->addSelectLanguage('language', get_lang('SearchFeatureDocumentLanguage'));
     foreach ($specific_fields as $specific_field) {
         $form->addElement('text', $specific_field['code'], $specific_field['name'].' : ');
     }