diff --git a/lingotek.module b/lingotek.module
index 6ae4297..e1197c9 100644
--- a/lingotek.module
+++ b/lingotek.module
@@ -480,4 +480,52 @@ function lingotek_form_language_admin_edit_form_alter(&$form, FormStateInterface
  */
 function lingotek_form_language_content_settings_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   \Drupal::service('lingotek.language_content_settings_form')->form($form, $form_state);
+  $form['parent_details']['actions']['upload_to_lingotek_checkbox'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Import these settings to Lingotek after saving configuration'),
+    '#default_value' => \Drupal::state()->get('upload_lingotek_field_settings'),
+  );
+  $form['actions']['submit']['#validate'][] = 'lingotek_form_language_content_settings_form_validate';
+}
+
+/**
+ * @param array $form
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ */
+function lingotek_form_language_content_settings_form_validate(&$form, FormStateInterface $form_state) {
+  
+  $settings = $form_state->getValues()['settings'];
+
+  /** @var \Drupal\lingotek\LingotekConfigurationServiceInterface $lingotek_config */
+  $lingotek_config = \Drupal::service('lingotek.configuration');
+
+  foreach($settings as $entity_id => $bundles){
+    foreach($bundles as $bundle_id => $bundleInfo){
+      if (isset($bundleInfo['translatable'])) {
+        $translatable = $bundleInfo['translatable'];
+        if($translatable){
+          if (!$lingotek_config->isEnabled($entity_id, $bundle_id)) {
+            $lingotek_config->setEnabled($entity_id, $bundle_id);
+          }
+          foreach($bundleInfo['fields'] as $field_id => $field_choice){
+            if($field_choice){
+              $lingotek_config->setFieldLingotekEnabled($entity_id, $bundle_id, $field_id);
+              if (isset($bundleInfo['fields'][$field_id . ':properties'])) {
+                $lingotek_config->setFieldPropertiesLingotekEnabled($entity_id, $bundle_id, $field_id, $bundleInfo['fields'][$field_id . ':properties']);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  \Drupal::entityManager()->clearCachedDefinitions();
+  \Drupal::service('router.builder')->setRebuildNeeded();
+  
+  if($form['parent_details']['actions']['upload_to_lingotek_checkbox']['#value']){
+    \Drupal::state()->set('upload_lingotek_field_settings',TRUE);
+  }else{
+    \Drupal::state()->set('upload_lingotek_field_settings',FALSE);
+  }
 }
diff --git a/src/Tests/Form/LingotekSettingsTabContentFormTest.php b/src/Tests/Form/LingotekSettingsTabContentFormTest.php
index e5c7661..8b4a234 100644
--- a/src/Tests/Form/LingotekSettingsTabContentFormTest.php
+++ b/src/Tests/Form/LingotekSettingsTabContentFormTest.php
@@ -225,6 +225,47 @@ class LingotekSettingsTabContentFormTest extends LingotekTestBase {
     $this->assertFalse($lingotek_config->isFieldLingotekEnabled('node', 'article', 'body'), 'The body field is disabled after being disabled for content translation');
     $this->assertFalse($lingotek_config->isFieldLingotekEnabled('node', 'article', 'image'), 'The image field is disabled after being disabled for content translation');
 
+    // Check the form contains the article type and only its text-based fields.
+    $this->drupalGet('admin/config/regional/content-language');
+
+    $this->assertFalse($lingotek_config->isFieldLingotekEnabled('node', 'article', 'body'), 'The body field is not enabled after other fields were disabled for content translation ='.$lingotek_config->isFieldLingotekEnabled('node', 'article', 'body'));
+    
+    // Go to the content language settings, and disable the body field.
+    // It should result that the field is disabled in Lingotek too.
+    $edit = array(
+      'entity_types[node]' => TRUE,
+      'settings[node][article][settings][language][language_alterable]' => TRUE,
+      'settings[node][article][translatable]' => TRUE,
+      'settings[node][article][fields][title]' => TRUE,
+      'settings[node][article][fields][body]' => TRUE,
+      'settings[node][article][fields][field_image]' => FALSE,
+      'upload_to_lingotek_checkbox' => TRUE,
+    );
+    //Now update the Body field using the Upload to Lingotek option
+    //see www.drupal.org/node/2890529
+    $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
+    
+    drupal_static_reset();
+    \Drupal::entityManager()->clearCachedDefinitions();
+    \Drupal::service('entity.definition_update_manager')->applyUpdates();
+    // Rebuild the container so that the new languages are picked up by services
+    // that hold a list of languages.
+    $this->rebuildContainer();
+
+    \Drupal::service('entity.definition_update_manager')->applyUpdates();
+    $lingotek_config = \Drupal::service('lingotek.configuration');
+
+    // Get the form and check the fields are not available, because they cannot be translated.
+    $this->drupalGet('admin/lingotek/settings');
+    $this->assertFieldChecked('edit-node-article-fields-title', 'The title field is enabled after other fields were disabled for content translation');
+    $this->assertFieldChecked('edit-node-article-fields-body', 'The body field is enabled after other fields were disabled for content translation');
+    $this->assertNoFieldById('edit-node-article-fields-field-image', 'The image field is not present after disabled for content translation');
+    $this->assertNoFieldById('edit-node-article-fields-field-imageproperties-alt', 'The image alt property is not present after image was disabled for content translation');
+
+    // But also check that the fields are not enabled.
+    $this->assertTrue($lingotek_config->isFieldLingotekEnabled('node', 'article', 'body'), 'The body field is enabled after other fields were disabled for content translation ='.$lingotek_config->isFieldLingotekEnabled('node', 'article', 'body'));
+    $this->assertFalse($lingotek_config->isFieldLingotekEnabled('node', 'article', 'image'), 'The image field is disabled after being disabled for content translation');
+
     // And if we disable the entity itself, it should not be enabled anymore.
     \Drupal::service('content_translation.manager')->setEnabled('node', 'article', FALSE);
     $this->assertFalse($lingotek_config->isEnabled('node', 'article'), 'The article entity is disabled after being disabled for content translation');