diff --git a/login/signup.php b/login/signup.php
index c8177f684fb..28a4683db28 100644
--- a/login/signup.php
+++ b/login/signup.php
@@ -12,6 +12,7 @@
 
             $user->password = md5($user->password);
             $user->confirmed = 0;
+            $user->lang = $CFG->lang;
             $user->firstaccess = time();
             $user->secret = random_string(15);
 
diff --git a/user/edit.html b/user/edit.html
index f0e04c89669..0d1dd7cc5e8 100644
--- a/user/edit.html
+++ b/user/edit.html
@@ -88,7 +88,7 @@ if (isadmin()) {
 	<td><P><? print_string("preferredlanguage") ?>:</td>
 	<td><? if ($languages = get_list_of_languages()) {
                if (!$user->lang) {
-                   $user->lang = "en";
+                   $user->lang = $CFG->lang;
                }
                choose_from_menu ($languages, "lang", $user->lang, "", "", "");
            }