diff --git a/module/story/tao.php b/module/story/tao.php
index 7e8c381a6b..37c0e292bc 100644
--- a/module/story/tao.php
+++ b/module/story/tao.php
@@ -2047,7 +2047,7 @@ class storyTao extends storyModel
                 $canStoryEstimate   = common::hasPriv('execution', 'storyEstimate') && $story->type == 'story';
 
                 $actions[] = array('name' => 'createTask',      'url' => $canCreateTask      ? $createTaskLink      : null, 'disabled' => !$canCreateTask, 'className' => 'create-task-btn');
-                $actions[] = array('name' => 'batchCreateTask', 'url' => $canBatchCreateTask ? $batchCreateTaskLink : null, 'disabled' => !$canBatchCreateTask);
+                $actions[] = array('name' => 'batchCreateTask', 'url' => $canBatchCreateTask ? $batchCreateTaskLink : null, 'disabled' => !$canBatchCreateTask, 'className' => 'batchcreate-task-btn');
                 $actions[] = array('name' => 'storyEstimate',   'url' => $canStoryEstimate   ? $storyEstimateLink   : null, 'disabled' => !$canStoryEstimate);
             }
 
diff --git a/module/task/ui/batchcreate.html.php b/module/task/ui/batchcreate.html.php
index 8ff1de09d5..e564cd46a7 100644
--- a/module/task/ui/batchcreate.html.php
+++ b/module/task/ui/batchcreate.html.php
@@ -140,6 +140,7 @@ if($execution->type == 'kanban')
 
 formBatchPanel
 (
+    set::id('taskBatchCreateForm'),
     set::title($lang->task->batchCreate),
     set::pasteField('name'),
     set::customFields(array('list' => $customFields, 'show' => explode(',', $showFields), 'key' => 'batchCreateFields')),
diff --git a/module/tutorial/config/scrumProjectManage.php b/module/tutorial/config/scrumProjectManage.php
index 5560ed2b07..6da741bf65 100644
--- a/module/tutorial/config/scrumProjectManage.php
+++ b/module/tutorial/config/scrumProjectManage.php
@@ -209,7 +209,7 @@ $scrumProjectManage->basic->tasks['manageTask']['steps'][] = array(
 
 $scrumProjectManage->basic->tasks['manageTask']['steps'][] = array(
     'type'   => 'click',
-    'target' => '#table-execution-story a.create-task-btn',
+    'target' => '#table-execution-story div[data-row="3"] a.batchcreate-task-btn',
     'url'    => array('execution', 'story', 'executionID=3'),
     'page'   => 'execution-story',
     'app'    => 'execution',
@@ -219,16 +219,16 @@ $scrumProjectManage->basic->tasks['manageTask']['steps'][] = array(
 
 $scrumProjectManage->basic->tasks['manageTask']['steps'][] = array(
     'type'   => 'form',
-    'url'    => array('task', 'create', 'executionID=3'),
+    'target' => '#taskBatchCreateForm',
     'app'    => 'execution',
-    'page'   => 'task-create',
+    'page'   => 'task-batchcreate',
     'title'  => $lang->tutorial->scrumProjectManage->manageTask->step4->name,
 );
 
 $scrumProjectManage->basic->tasks['manageTask']['steps'][] = array(
     'type'   => 'saveForm',
-    'target' => 'form button[type="submit"]',
-    'page'   => 'task-create',
+    'target' => '#taskBatchCreateForm form button[type="submit"]',
+    'page'   => 'task-batchcreate',
     'title'  => $lang->tutorial->scrumProjectManage->manageTask->step5->name,
     'desc'   => $lang->tutorial->scrumProjectManage->manageTask->step5->desc
 );
diff --git a/module/tutorial/config/waterfallProjectManage.php b/module/tutorial/config/waterfallProjectManage.php
index e4de15becf..9f37575494 100644
--- a/module/tutorial/config/waterfallProjectManage.php
+++ b/module/tutorial/config/waterfallProjectManage.php
@@ -189,7 +189,7 @@ $waterfallProjectManage->basic->tasks['manageTask']['steps'][] = array(
 
 $waterfallProjectManage->basic->tasks['manageTask']['steps'][] = array(
     'type'   => 'click',
-    'target' => '#table-execution-story a.create-task-btn',
+    'target' => '#table-execution-story div[data-row="3"] a.batchcreate-task-btn',
     'url'    => array('execution', 'story', 'executionID=3'),
     'page'   => 'execution-story',
     'app'    => 'execution',
@@ -199,16 +199,16 @@ $waterfallProjectManage->basic->tasks['manageTask']['steps'][] = array(
 
 $waterfallProjectManage->basic->tasks['manageTask']['steps'][] = array(
     'type'   => 'form',
-    'url'    => array('task', 'create', 'executionID=3'),
+    'target' => '#taskBatchCreateForm',
     'app'    => 'execution',
-    'page'   => 'task-create',
+    'page'   => 'task-batchcreate',
     'title'  => $lang->tutorial->waterfallProjectManage->manageTask->step4->name,
 );
 
 $waterfallProjectManage->basic->tasks['manageTask']['steps'][] = array(
     'type'   => 'saveForm',
-    'target' => 'form button[type="submit"]',
-    'page'   => 'task-create',
+    'target' => '#taskBatchCreateForm form button[type="submit"]',
+    'page'   => 'task-batchcreate',
     'title'  => $lang->tutorial->waterfallProjectManage->manageTask->step5->name,
     'desc'   => $lang->tutorial->waterfallProjectManage->manageTask->step5->desc
 );