diff --git a/module/task/js/create.js b/module/task/js/create.js
index c9454f2294..d89252847a 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -38,10 +38,35 @@ function setPreview()
         $('#preview').removeClass('hidden');
         $('#preview').attr('href', storyLink);
     }
+    setAfter();
 }
+
+/**
+ * Set after locate. 
+ * 
+ * @access public
+ * @return void
+ */
+function setAfter()
+{
+    if($("#story").select().val() == '') 
+    {
+      if($('input[value="continueAdding"]').attr('checked') == true) 
+      {
+        $('input[value="toTaskList"]').attr('checked', true);
+      }
+      $('input[value="continueAdding"]').attr('disabled', 'disabled');
+    }
+    else
+    {
+      $('input[value="continueAdding"]').attr('disabled', false);
+    }
+}
+
 $(document).ready(function()
 {
     setPreview();
     $("#story").chosen({no_results_text: noResultsMatch});
     $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true});
+    setAfter();
 });
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index f178177c5a..899bd483a2 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -105,7 +105,7 @@ $lang->task->reasonList['done']   = 'Done';
 $lang->task->reasonList['cancel'] = 'Canceled';
 
 $lang->task->afterChoices['continueAdding'] = 'Continue to add task for this story. ';
-$lang->task->afterChoices['toTastList']     = 'To task list. ';
+$lang->task->afterChoices['toTaskList']     = 'To task list. ';
 $lang->task->afterChoices['toStoryList']    = 'To story list. ';
 
 $lang->task->buttonEdit       = 'Edit';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 933cac46d1..21ed8fddd9 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -105,7 +105,7 @@ $lang->task->reasonList['done']   = '已完成';
 $lang->task->reasonList['cancel'] = '已取消';
 
 $lang->task->afterChoices['continueAdding'] = '继续为该需求添加任务';
-$lang->task->afterChoices['toTastList']     = '返回任务列表';
+$lang->task->afterChoices['toTaskList']     = '返回任务列表';
 $lang->task->afterChoices['toStoryList']    = '返回需求列表';
 
 $lang->task->buttonEdit       = '编辑';