diff --git a/core/modules/openid/openid.test b/core/modules/openid/openid.test
index f68801a..2053771 100644
--- a/core/modules/openid/openid.test
+++ b/core/modules/openid/openid.test
@@ -571,7 +571,7 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase {
 
     $user = user_load_by_name('john');
     $this->assertTrue($user, t('User was registered with right username.'));
-    $this->assertFalse($user->preferred_langcode, t('No user language was saved.'));
+    $this->assertEqual($user->preferred_langcode, LANGUAGE_NOT_SPECIFIED, t('No user language was saved.'));
     $this->assertFalse($user->data, t('No additional user info was saved.'));
 
     // Follow the one-time login that was sent in the welcome e-mail.
@@ -611,7 +611,7 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase {
 
     $user = user_load_by_name('john');
     $this->assertTrue($user, t('User was registered with right username.'));
-    $this->assertFalse($user->preferred_langcode, t('No user language was saved.'));
+    $this->assertEqual($user->preferred_langcode, LANGUAGE_NOT_SPECIFIED, t('No user language was saved.'));
     $this->assertFalse($user->data, t('No additional user info was saved.'));
 
     // Follow the one-time login that was sent in the welcome e-mail.
diff --git a/core/modules/user/user.entity.inc b/core/modules/user/user.entity.inc
index 2c625dc..fe351e6 100644
--- a/core/modules/user/user.entity.inc
+++ b/core/modules/user/user.entity.inc
@@ -113,7 +113,7 @@ class User extends Entity {
    *
    * @var integer
    */
-  public $picture = 0;
+  public $picture = NULL;
 
   /**
    * The email address used for initial account creation.
@@ -142,6 +142,14 @@ class User extends Entity {
 
     // Users always have the authenticated user role.
     $this->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+
+    // Make sure picture is NULL if not set.
+    if (empty($this->picture)) {
+      $this->picture = (int)NULL;
+    }
+
+    // Make sure login is an integer.
+    $this->login = (int)$this->login;
   }
 }
 
@@ -160,7 +168,9 @@ class UserStorageController extends EntityDatabaseStorageController {
     // Build an array of user picture IDs so that these can be fetched later.
     $picture_fids = array();
     foreach ($queried_users as $key => $record) {
-      $picture_fids[] = $record->picture;
+      if ($record->picture) {
+        $picture_fids[] = $record->picture;
+      }
       $queried_users[$key]->data = unserialize($record->data);
       $queried_users[$key]->roles = array();
       if ($record->uid) {
diff --git a/core/modules/user/user.test b/core/modules/user/user.test
index e1e07d6..17f82a0 100644
--- a/core/modules/user/user.test
+++ b/core/modules/user/user.test
@@ -166,8 +166,8 @@ 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->langcode, '', t('Correct language field.'));
-    $this->assertEqual($new_user->preferred_langcode, '', t('Correct preferred language field.'));
+    $this->assertEqual($new_user->langcode, LANGUAGE_NOT_SPECIFIED, t('Correct language field.'));
+    $this->assertEqual($new_user->preferred_langcode, LANGUAGE_NOT_SPECIFIED, t('Correct preferred language field.'));
     $this->assertEqual($new_user->picture, '', t('Correct picture field.'));
     $this->assertEqual($new_user->init, $mail, t('Correct init field.'));
   }
@@ -1598,10 +1598,10 @@ class UserSaveTestCase extends DrupalWebTestCase {
       'name' => $test_name,
       'uid' => $test_uid,
       'mail' => $test_name . '@example.com',
-      'is_new' => TRUE,
       'pass' => user_password(),
       'status' => 1,
     ));
+    $user->enforceIsNew();
     $user->save();
 
     // Test if created user exists.