diff --git a/module/todo/css/batchcreate.ui.css b/module/todo/css/batchcreate.ui.css
new file mode 100644
index 0000000000..ce5822f08e
--- /dev/null
+++ b/module/todo/css/batchcreate.ui.css
@@ -0,0 +1 @@
+.modal-dialog .modal-actions {display: none;}
diff --git a/module/todo/js/batchcreate.ui.js b/module/todo/js/batchcreate.ui.js
index 18e21c0b53..1beea3dc75 100644
--- a/module/todo/js/batchcreate.ui.js
+++ b/module/todo/js/batchcreate.ui.js
@@ -37,11 +37,17 @@ window.changeType = function(e)
 window.changFuture = function()
 {
     const isChecked = $('#futureDate[type="checkbox"]').prop('checked');
-    $todoDate = $('#todoDate').zui('datePicker');
+    const $todoDate = $('#todoDate').zui('datePicker');
+    if(isChecked) $todoDate.$.setValue('');
 
-    $('#batchCreateTodoForm #date').val($todoDate.$.state.value);
-    $('#batchCreateTodoForm #futureDate').val(isChecked ? 1 : 0);
-    $todoDate.render({disabled: isChecked});
+    $('.panel-body form [name=futureDate]').val(isChecked ? 1 : 0);
+}
+
+window.changeTodoDate = function()
+{
+    const todoDate = $('#todoDate [name=date]').val();
+    if(todoDate) $('#futureDate[type="checkbox"]').prop('checked', false);
+    $('.panel-body form [name=date]').val(todoDate);
 }
 
 window.initTime = function(e)
diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php
index 903619fe87..17c26afb21 100644
--- a/module/todo/lang/de.php
+++ b/module/todo/lang/de.php
@@ -46,6 +46,7 @@ $lang->todo->reasonList['bug']   = 'Bug übertragen';
 $lang->todo->reasonList['done']  = 'Erledigt';
 
 $lang->todo->id           = 'ID';
+$lang->todo->idAB         = 'ID';
 $lang->todo->account      = 'Besitzer';
 $lang->todo->date         = 'Datum';
 $lang->todo->begin        = 'Start';
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 002fc13269..ae07cef355 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -46,6 +46,7 @@ $lang->todo->reasonList['bug']   = 'Convert to Bug';
 $lang->todo->reasonList['done']  = 'Done';
 
 $lang->todo->id           = 'ID';
+$lang->todo->idAB         = 'ID';
 $lang->todo->account      = 'Owner';
 $lang->todo->date         = 'Date';
 $lang->todo->begin        = 'Begin';
diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php
index a906431f2b..ee2a0e387c 100644
--- a/module/todo/lang/fr.php
+++ b/module/todo/lang/fr.php
@@ -46,6 +46,7 @@ $lang->todo->reasonList['bug']   = 'Convertir en Bug';
 $lang->todo->reasonList['done']  = 'Fait';
 
 $lang->todo->id           = 'ID';
+$lang->todo->idAB         = 'ID';
 $lang->todo->account      = 'Owner';
 $lang->todo->date         = 'Date';
 $lang->todo->begin        = 'Début';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 16de1dc987..f3bbefe2a2 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -46,6 +46,7 @@ $lang->todo->reasonList['bug']   = '转Bug';
 $lang->todo->reasonList['done']  = '完成';
 
 $lang->todo->id           = '编号';
+$lang->todo->idAB         = '序号';
 $lang->todo->account      = '由谁创建';
 $lang->todo->date         = '日期';
 $lang->todo->begin        = '开始';
diff --git a/module/todo/ui/batchcreate.html.php b/module/todo/ui/batchcreate.html.php
index 1baff35e37..82107009b0 100644
--- a/module/todo/ui/batchcreate.html.php
+++ b/module/todo/ui/batchcreate.html.php
@@ -36,6 +36,7 @@ formBatchPanel
 (
     setID('batchCreateTodoForm'),
     set::customFields(array('list' => $customFields, 'show' => explode(',', $showFields), 'key' => 'batchCreateFields')),
+    set::actions(array('submit', array('text' => $lang->goback, 'data-dismiss' => 'modal'))),
 
     on::change('[data-name="type"]', 'changeType'),
     on::change('.time-input', 'initTime'),
@@ -61,7 +62,7 @@ formBatchPanel
                     setID('todoDate'),
                     set::name('date'),
                     set::value($date),
-                    on::change('window.changFuture')
+                    on::change('window.changeTodoDate')
                 ),
                 span
                 (
@@ -80,51 +81,11 @@ formBatchPanel
     formBatchItem
     (
         set::name('id'),
-        set::label($lang->idAB),
+        set::label($lang->todo->idAB),
         set::control('index'),
         set::width('30px')
     ),
     formBatchItem
-    (
-        set::name('type'),
-        set::label($lang->todo->type),
-        set::width('120px'),
-        set::control(array('type' => 'picker', 'required' => true)),
-        set::value('custom'),
-        set::items($lang->todo->typeList)
-    ),
-    formBatchItem
-    (
-        set::name('pri'),
-        set::label($lang->todo->pri),
-        set::width('80px'),
-        set::control(array('type' => 'priPicker', 'required' => true)),
-        set::value('3'),
-        set::items($lang->todo->priList)
-    ),
-    formBatchItem
-    (
-        set::name('name'),
-        set::label($lang->todo->name),
-        set::minWidth('100px')
-    ),
-    formBatchItem
-    (
-        set::name('desc'),
-        set::label($lang->todo->desc),
-        set::control('textarea')
-    ),
-    formBatchItem
-    (
-        set::name('assignedTo'),
-        set::label($lang->todo->assignedTo),
-        set::value($app->user->account),
-        set::ditto(true),
-        set::width('140px'),
-        set::control(array('type' => 'picker', 'required' => true)),
-        set::items($users)
-    ),
-    formBatchItem
     (
         set::label($lang->todo->beginAndEnd),
         set::width('260px'),
@@ -161,6 +122,47 @@ formBatchPanel
             )
         )
     ),
+    formBatchItem
+    (
+        set::name('type'),
+        set::label($lang->todo->type),
+        set::width('120px'),
+        set::control(array('type' => 'picker', 'required' => true)),
+        set::value('custom'),
+        set::items($lang->todo->typeList)
+    ),
+    formBatchItem
+    (
+        set::name('name'),
+        set::label($lang->todo->name),
+        set::required(true),
+        set::minWidth('100px')
+    ),
+    formBatchItem
+    (
+        set::name('desc'),
+        set::label($lang->todo->desc),
+        set::control('textarea')
+    ),
+    formBatchItem
+    (
+        set::name('assignedTo'),
+        set::label($lang->todo->assignedTo),
+        set::value($app->user->account),
+        set::ditto(true),
+        set::width('140px'),
+        set::control(array('type' => 'picker', 'required' => true)),
+        set::items($users)
+    ),
+    formBatchItem
+    (
+        set::name('pri'),
+        set::label($lang->todo->pri),
+        set::width('80px'),
+        set::control(array('type' => 'priPicker', 'required' => true)),
+        set::value('3'),
+        set::items($lang->todo->priList)
+    ),
     input(set::type('hidden'), set::name('date'), set::value($date)),
     input(set::type('hidden'), set::name('futureDate'), set::value(0))
 );