diff --git a/src/Form/JobForm.php b/src/Form/JobForm.php
index 6d1d532..8eef902 100644
--- a/src/Form/JobForm.php
+++ b/src/Form/JobForm.php
@@ -540,11 +540,6 @@ class JobForm extends TmgmtFormBase {
     $response = new AjaxResponse();
     $response->addCommand(new ReplaceCommand('#tmgmt-ui-translator-wrapper', $this->renderer->render($form['translator_wrapper'])));
     $response->addCommand(new ReplaceCommand('#tmgmt-ui-' . str_replace('_', '-', $replace), $this->renderer->render($form['info'][$replace])));
-
-    // Replace value of the label field with ajax on language change.
-    // @todo This manual overwrite is necessary because somehow an old job entity seems to be used.
-    $form['info']['label']['#value'] = $form_state->getValue('label');
-    $response->addCommand(new ReplaceCommand('#tmgmt-ui-label', $this->renderer->render($form['info']['label'])));
     return $response;
   }
 
diff --git a/src/Tests/TMGMTUiTest.php b/src/Tests/TMGMTUiTest.php
index 6e5bd43..2757317 100644
--- a/src/Tests/TMGMTUiTest.php
+++ b/src/Tests/TMGMTUiTest.php
@@ -249,6 +249,13 @@ class TMGMTUiTest extends TMGMTTestBase {
     $this->drupalPostAjaxForm('admin/tmgmt/jobs/' . $job->id(), $edit, 'target_language');
     $this->assertFieldByXPath('//select[@id="edit-translator"]/option[1]', 'Test translator (auto created)');
 
+    // Check for label field.
+		$edit = [
+      'target_language' => 'el',
+    ];
+		$this->drupalPostAjaxForm('admin/tmgmt/jobs/' . $job->id(), $edit, 'target_language');
+		$this->assertField('label[0][value]', 'Label');
+
     // Test exposed filters.
     $this->drupalGet('admin/tmgmt/jobs', array('query' => array(
       'state' => '1',