diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 1b511e1..6026965 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -292,6 +292,7 @@ public function getTranslationLanguages($include_default = TRUE) {
     // converted to use the entity field API.
     $default_language = $this->language();
     $languages = array($default_language->langcode => $default_language);
+    $installed_languages = language_list(LANGUAGE_ALL);
     $entity_info = $this->entityInfo();
 
     if ($entity_info['fieldable']) {
@@ -305,14 +306,14 @@ public function getTranslationLanguages($include_default = TRUE) {
           }
         }
       }
-      $languages = array_intersect_key(language_list(LANGUAGE_ALL), $languages);
+      $languages = array_intersect_key($installed_languages, $languages);
     }
 
-    if (empty($include_default)) {
+    if (empty($include_default) || $default_language->locked) {
       unset($languages[$default_language->langcode]);
     }
 
-    return $languages;
+    return !empty($languages) ? $languages : array(LANGUAGE_NOT_SPECIFIED => $installed_languages[LANGUAGE_NOT_SPECIFIED]);
   }
 
   /**
diff --git a/core/modules/field/field.default.inc b/core/modules/field/field.default.inc
index d37d0ac..dd8c65d 100644
--- a/core/modules/field/field.default.inc
+++ b/core/modules/field/field.default.inc
@@ -80,9 +80,11 @@ function field_default_insert($entity_type, $entity, $field, $instance, $langcod
   // assigning it a default value. This way we ensure that only the intended
   // languages get a default value. Otherwise we could have default values for
   // not yet open languages.
-  if (empty($entity) || (!isset($entity->{$field['field_name']}[$langcode]) && !property_exists($entity, $field['field_name'])) ||
-    (isset($entity->{$field['field_name']}[$langcode]) && count($entity->{$field['field_name']}[$langcode]) == 0)) {
-    $items = field_get_default_value($entity_type, $entity, $field, $instance, $langcode);
+  if (empty($entity) || !isset($entity->{$field['field_name']}) || !array_key_exists($langcode, $entity->{$field['field_name']})) {
+    $translations = $entity->getTranslationLanguages();
+    if (!field_is_translatable($entity_type, $field) || isset($translations[$langcode])) {
+      $items = field_get_default_value($entity_type, $entity, $field, $instance, $langcode);
+    }
   }
 }
 
diff --git a/core/modules/field/lib/Drupal/field/Tests/FormTest.php b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
index b11638f..647bf88 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FormTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
@@ -69,7 +69,6 @@ function testFieldFormSingle() {
     $this->assertText($token_description, 'Token replacement for description is displayed');
     $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget is displayed');
     $this->assertNoField("{$this->field_name}[$langcode][1][value]", 'No extraneous widget is displayed');
-    // TODO : check that the widget is populated with default value ?
 
     // Check that hook_field_widget_form_alter() does not believe this is the
     // default value form.
@@ -113,7 +112,34 @@ function testFieldFormSingle() {
     entity_get_controller('test_entity')->resetCache(array($id));
     $entity = field_test_entity_test_load($id);
     $this->assertIdentical($entity->{$this->field_name}, array(), 'Field was emptied');
+  }
 
+  /**
+   * Tests field widget default values on entity forms.
+   */
+  function testFieldFormDefaultValue() {
+    $this->field = $this->field_single;
+    $this->field_name = $this->field['field_name'];
+    $this->instance['field_name'] = $this->field_name;
+    $default = rand(1, 127);
+    $this->instance['default_value'] = array(array('value' => $default));
+    field_create_field($this->field);
+    field_create_instance($this->instance);
+    $langcode = LANGUAGE_NOT_SPECIFIED;
+
+    // Display creation form.
+    $this->drupalGet('test-entity/add/test_bundle');
+    // Test that the default value is displayed correctly.
+    $this->assertFieldByXpath("//input[@name='{$this->field_name}[$langcode][0][value]' and @value='$default']");
+
+    // Try to submit an empty value.
+    $edit = array("{$this->field_name}[$langcode][0][value]" => '');
+    $this->drupalPost(NULL, $edit, t('Save'));
+    preg_match('|test-entity/manage/(\d+)/edit|', $this->url, $match);
+    $id = $match[1];
+    $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), 'Entity was created.');
+    $entity = field_test_entity_test_load($id);
+    $this->assertEqual($entity->{$this->field_name}[$langcode][0]['value'], '', 'Field is now empty.');
   }
 
   function testFieldFormSingleRequired() {
diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
index 8f813c0..378a4b6 100644
--- a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
@@ -242,6 +242,59 @@ function testTranslatableFieldSaveLoad() {
       }
       $this->assertTrue($result, format_string('%language translation correctly handled.', array('%language' => $langcode)));
     }
+
+    // Test default values.
+    $field_name = drupal_strtolower($this->randomName() . '_field_name');
+    $field = $this->field;
+    $field['field_name'] = $field_name;
+    $instance = $this->instance;
+    $instance['field_name'] = $field_name;
+    $default = rand(1, 127);
+    $instance['default_value'] = array(array('value' => $default));
+    field_create_field($field);
+    field_create_instance($instance);
+    $translation_langcodes = array_slice($available_langcodes, 0, 2);
+    asort($translation_langcodes);
+    $translation_langcodes = array_values($translation_langcodes);
+
+    $eid++;
+    $evid++;
+    $entity = field_test_create_entity($eid, $evid, $instance['bundle']);
+    foreach ($translation_langcodes as $langcode) {
+      $entity->{$this->field_name}[$langcode] = $this->_generateTestFieldValues($this->field['cardinality']);
+    }
+
+    field_attach_insert($entity_type, $entity);
+    unset($entity->{$field_name});
+    field_attach_load($entity_type, array($eid => $entity));
+
+    ksort($entity->{$field_name});
+    $field_langcodes = array_keys($entity->{$field_name});
+    $this->assertEqual($translation_langcodes, $field_langcodes, 'Missing translations did not get a default value.');
+
+    foreach ($entity->{$field_name} as $langcode => $items) {
+      $this->assertEqual($items, $instance['default_value'], format_string('Default value correctly stored for language %language.', array('%language' => $langcode)));
+    }
+
+    // Check that explicit empty values are not overridden with default values.
+    foreach (array(NULL, array()) as $empty_items) {
+      $eid++;
+      $evid++;
+      $entity = field_test_create_entity($eid, $evid, $instance['bundle']);
+      foreach ($translation_langcodes as $langcode) {
+        $entity->{$this->field_name}[$langcode] = $this->_generateTestFieldValues($this->field['cardinality']);
+      }
+
+      foreach ($translation_langcodes as $langcode) {
+        $entity->{$field_name}[$langcode] = $empty_items;
+      }
+
+      field_attach_insert($entity_type, $entity);
+      unset($entity->{$field_name});
+      field_attach_load($entity_type, array($eid => $entity));
+
+      $this->assertEqual(count($entity->{$field_name}), 0, 'Empty values did not get a default value.');
+    }
   }
 
   /**