diff --git a/core/includes/locale.inc b/core/includes/locale.inc
index ab11d31..8095e94 100644
--- a/core/includes/locale.inc
+++ b/core/includes/locale.inc
@@ -215,7 +215,7 @@ function locale_language_from_user($languages) {
   global $user;
 
   if ($user->uid) {
-    return $user->language;
+    return $user->langcode;
   }
 
   // No language preference from the user.
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index f7175c3..9b3738a 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -202,7 +202,7 @@ function user_schema() {
         'not null' => FALSE,
         'description' => "User's time zone.",
       ),
-      'language' => array(
+      'langcode' => array(
         'type' => 'varchar',
         'length' => 12,
         'not null' => TRUE,
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 928daad..a6ff19d 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -3460,8 +3460,8 @@ function theme_user_signature($variables) {
  */
 function user_preferred_language($account, $default = NULL) {
   $language_list = language_list();
-  if (!empty($account->language) && isset($language_list[$account->language])) {
-    return $language_list[$account->language];
+  if (!empty($account->langcode) && isset($language_list[$account->langcode])) {
+    return $language_list[$account->langcode];
   }
   else {
     return $default ? $default : language_default();
diff --git a/core/modules/user/user.test b/core/modules/user/user.test
index 367bf82..4b9ac20 100644
--- a/core/modules/user/user.test
+++ b/core/modules/user/user.test
@@ -166,7 +166,7 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
     $this->assertTrue(($new_user->created > REQUEST_TIME - 20 ), t('Correct creation time.'));
     $this->assertEqual($new_user->status, variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL) == USER_REGISTER_VISITORS ? 1 : 0, t('Correct status field.'));
     $this->assertEqual($new_user->timezone, variable_get('date_default_timezone'), t('Correct time zone field.'));
-    $this->assertEqual($new_user->language, '', t('Correct language field.'));
+    $this->assertEqual($new_user->langcode, '', t('Correct language field.'));
     $this->assertEqual($new_user->picture, '', t('Correct picture field.'));
     $this->assertEqual($new_user->init, $mail, t('Correct init field.'));
   }