diff --git a/translators/tmgmt_local/src/LocalTranslatorUi.php b/translators/tmgmt_local/src/LocalTranslatorUi.php
index ab63f82..e02a720 100755
--- a/translators/tmgmt_local/src/LocalTranslatorUi.php
+++ b/translators/tmgmt_local/src/LocalTranslatorUi.php
@@ -35,6 +35,12 @@ class LocalTranslatorUi extends TranslatorPluginUiBase {
         '#markup' => t('There are no translators available.'),
       );
     }
+    $form['job_comment'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Comment for the translation'),
+      '#description' => t('You can provide a comment so that the translator will better understand your requirements.'),
+      '#default_value' => $job->getSetting('job_comment'),
+    );
 
     return $form;
   }
diff --git a/translators/tmgmt_local/src/Tests/LocalTranslatorTest.php b/translators/tmgmt_local/src/Tests/LocalTranslatorTest.php
index c6852aa..e364650 100755
--- a/translators/tmgmt_local/src/Tests/LocalTranslatorTest.php
+++ b/translators/tmgmt_local/src/Tests/LocalTranslatorTest.php
@@ -179,7 +179,6 @@ class LocalTranslatorTest extends TMGMTTestBase {
     $this->loginAsTranslator();
     $job = $this->createJob();
     $job->translator = $translator->id();
-    $job->settings->job_comment = $job_comment = 'Dummy job comment';
     $job->addItem('test_source', 'test', '1');
     $job->addItem('test_source', 'test', '2');
     $job->save();
@@ -245,7 +244,21 @@ class LocalTranslatorTest extends TMGMTTestBase {
     $this->drupalGet($job->toUrl());
     $this->assertText($this->localTranslator->getUsername());
 
-    $job->requestTranslation();
+    // Test assign task while submitting job.
+    $job_comment = 'Dummy job comment';
+    $edit = [
+      'settings[translator]' => $this->localTranslator->id(),
+      'settings[job_comment]' => $job_comment,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Submit to translator'));
+    $this->drupalLogin($this->localTranslator);
+    $this->drupalGet('translate/pending');
+    $this->assertText(t('Task for @job', array('@job' => $job->label())));
+
+    $this->loginAsAdmin(['administer translation tasks']);
+    $this->drupalGet('manage-translate/assigned');
+    $this->clickLink(t('Unassign'));
+    $this->drupalPostForm(NULL, [], t('Unassign'));
 
     // Test for job comment in the job checkout info pane.
     $this->drupalGet($job->toUrl());