diff --git a/i18n_field/i18n_field.module b/i18n_field/i18n_field.module
index 83d13e3..86dff19 100644
--- a/i18n_field/i18n_field.module
+++ b/i18n_field/i18n_field.module
@@ -177,7 +177,7 @@ function i18n_field_field_widget_form_alter(&$element, &$form_state, $context) {
   global $language;
 
   // Skip the node type edit fields by checking for existing entity
-  if (empty($element['#entity'])) {
+  if (empty($element['#entity']) && empty($element['value']['#entity']) && empty($element[0]['#entity'])) {
     return;
   }
 
@@ -208,6 +208,9 @@ function i18n_field_field_widget_form_alter(&$element, &$form_state, $context) {
     if (isset($element['value']) && !empty($element['value']['#title']) && $element['value']['#title'] == $instance['label']) {
       $element['value']['#title'] = $instance_current['label'];
     }
+    if (isset($element[0]) && !empty($element[0]['#title']) && $element[0]['#title'] == $instance['label']) {
+      $element[0]['#title'] = $instance_current['label'];
+    }
   }
 
   // Translate field description if set and it is the default one.