diff --git a/include/class_Language.inc b/include/class_Language.inc
index 192d50a2a2f0a2f9a0f8a0dd8a76069711e944c3..7b67c983de85e19fe37612fbc0755d12c82d163f 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -112,7 +112,7 @@ class Language
     }
 
     /* Load supported languages */
-    $languages = static::list();
+    $languages = static::getList();
 
     /* Move supported languages to flat list */
     $langs = array();
@@ -129,7 +129,7 @@ class Language
    *
    * \param boolean $ownLanguage Should language names be stated in their own language as well
    */
-  public static function list($ownLanguage = FALSE)
+  public static function getList($ownLanguage = FALSE)
   {
     /* locales in english */
     $tmp_english = array(
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index 20cdbf1aeae48a332993fd8cdc50ea253d3656f4..bdc2e66249cddf5b9e5c7ad3bd794a9ebba5468f 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -451,7 +451,7 @@ class configInLdap extends simplePlugin
     global $config;
     $attributesInfo = static::getAttributesInfo();
     /* Languages */
-    $languages = Language::list(TRUE);
+    $languages = Language::getList(TRUE);
     asort($languages);
     $languages = array_merge(array("" => _("Automatic")), $languages);
     $attributesInfo['look_n_feel']['attrs'][0]->setChoices(array_keys($languages), array_values($languages));
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index b57fc5c18b252c8e1c68618e7df6b71c1000ac06..2e4c64cba3c1415fded7b7cbe84eb63540b30af3 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -304,7 +304,9 @@ class user extends simplePlugin
   static function getAttributesInfo ()
   {
     global $config;
-    $languages = array_merge(array('' => ''), Language::list(TRUE));
+    $languages = Language::getList(TRUE);
+    asort($languages);
+    $languages = array_merge(array('' => ''), $languages);
     $attributesInfo = array(
       'perso' => array(
         'name'  => _('Personal information'),
diff --git a/setup/class_setupStepLanguage.inc b/setup/class_setupStepLanguage.inc
index cdb0171891f6ebc173f2820730a7a4ed2d196db1..746634e4a77a22c66faf99a44b5d360892ab19e9 100644
--- a/setup/class_setupStepLanguage.inc
+++ b/setup/class_setupStepLanguage.inc
@@ -64,7 +64,7 @@ class setupStepLanguage extends setupStep
 
   function execute()
   {
-    $languages = Language::list(TRUE);
+    $languages = Language::getList(TRUE);
     asort($languages);
     $languages = array_merge(array("" => _("Automatic")), $languages);
     $this->attributesAccess['lang_selected']->setChoices(array_keys($languages), array_values($languages));