diff --git a/field_collection.module b/field_collection.module
index dcc6592..864ef25 100644
--- a/field_collection.module
+++ b/field_collection.module
@@ -518,6 +518,7 @@ class FieldCollectionItemEntity extends Entity {
       else {
         $host_entity->{$this->field_name}[$this->langcode][] =  array('entity' => $this);
       }
+      unset($_POST['form_build_id']);
       return entity_save($this->hostEntityType, $host_entity);
     }
   }
diff --git a/field_collection.pages.inc b/field_collection.pages.inc
index ebe96aa..22d6012 100644
--- a/field_collection.pages.inc
+++ b/field_collection.pages.inc
@@ -117,7 +117,11 @@ function field_collection_item_add($field_name, $entity_type, $entity_id, $revis
   $field = field_info_field($field_name);
 
   if (empty($langcode)) {
-    $langcode = entity_language($entity_type, $entity);
+    if ($field['translatable']) {
+      $langcode = entity_language($entity_type, $entity);
+    } else {
+      $langcode = 'und';
+    }
   }
 
   if (!($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || !isset($entity->{$field_name}[$langcode]) || count($entity->{$field_name}[$langcode]) < $field['cardinality'])) {