diff --git a/user/edit_form.php b/user/edit_form.php
index df1a4d328ce..661825c5e1a 100644
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -54,8 +54,7 @@ class user_edit_form extends moodleform {
         if ($langsel = $mform->getElementValue('lang')) {
             $lang = reset($langsel);
             // check lang exists
-            if (!file_exists($CFG->dataroot.'/lang/'.$lang) and
-              !file_exists($CFG->dirroot .'/lang/'.$lang)) {
+            if (get_string_manager()->translation_exists($lang, false)) {
                 $lang_el =& $mform->getElement('lang');
                 $lang_el->setValue($CFG->lang);
             }
diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index b82e7396a6e..d22b083ece8 100644
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -74,8 +74,7 @@ class user_editadvanced_form extends moodleform {
         if ($langsel = $mform->getElementValue('lang')) {
             $lang = reset($langsel);
             // check lang exists
-            if (!file_exists($CFG->dataroot.'/lang/'.$lang) and
-              !file_exists($CFG->dirroot .'/lang/'.$lang)) {
+            if (get_string_manager()->translation_exists($lang, false)) {
                 $lang_el =& $mform->getElement('lang');
                 $lang_el->setValue($CFG->lang);
             }