diff --git a/module/task/tao.php b/module/task/tao.php
index ac21617cd0..1e473802b2 100644
--- a/module/task/tao.php
+++ b/module/task/tao.php
@@ -876,7 +876,7 @@ class taskTao extends taskModel
 
         if($task->status != 'cancel' && strpos($requiredFields, ',estimate,') !== false)
         {
-            if(strlen(trim($task->estimate)) == 0) dao::$errors['estimate'] = sprintf($this->lang->error->notempty, $this->lang->task->estimate);
+            if(empty($task->estimate)) dao::$errors['estimate'] = sprintf($this->lang->error->notempty, $this->lang->task->estimate);
             $requiredFields = str_replace(',estimate,', ',', $requiredFields);
         }
 
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index fb639312b7..c8303c2e52 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -268,6 +268,7 @@ formPanel
         (
             set::width('1/2'),
             set::label($lang->task->module),
+            set::required(strpos(",{$this->config->task->create->requiredFields},", ",module,") !== false),
             inputGroup
             (
                 picker
@@ -381,6 +382,7 @@ formPanel
         (
             set::label($lang->task->story),
             setClass(empty($stories) ? 'hidden' : ''),
+            set::required(strpos(",{$this->config->task->create->requiredFields},", ",story,") !== false),
             inputGroup
             (
                 picker
@@ -495,11 +497,9 @@ formPanel
     formGroup
     (
         set::label($lang->task->desc),
-        editor
-        (
-            set::name('desc'),
-            set::rows('5')
-        )
+        set::control('editor'),
+        set::name('desc'),
+        set::rows('5')
     ),
     formGroup
     (
@@ -511,6 +511,7 @@ formPanel
         set::width('1/2'),
         set::label($lang->task->datePlan),
         setClass($hiddenDatePlan),
+        set::required(strpos(",{$this->config->task->create->requiredFields},", ",estStarted,") !== false || strpos(",{$this->config->task->create->requiredFields},", ",deadline,") !== false),
         inputGroup
         (
             datepicker
diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php
index c7008f432e..387a2156b0 100644
--- a/module/task/ui/edit.html.php
+++ b/module/task/ui/edit.html.php
@@ -162,32 +162,36 @@ detailBody
             item
             (
                 set::name($lang->task->module),
-                inputGroup
+                set::required(strpos(",{$this->config->task->edit->requiredFields},", ",module,") !== false),
+                formGroup
                 (
-                    div
+                    inputGroup
                     (
-                        setClass('flex grow'),
-                        picker
+                        div
                         (
-                            setClass('w-full'),
-                            set::name('module'),
-                            set::value($task->module),
-                            set::items($moduleOptions),
-                            set::width(2/3),
-                            set::required(true)
-                        )
-                    ),
-                    div
-                    (
-                        setClass('flex'),
-                        checkbox(
-                            setID('showAllModule'),
-                            set::rootClass('items-center ml-3'),
-                            set::name('showAllModule'),
-                            set::text($lang->all),
-                            set::value(1),
-                            set::checked($showAllModule),
-                            on::change('loadAllModule')
+                            setClass('flex grow'),
+                            picker
+                            (
+                                setClass('w-full'),
+                                set::name('module'),
+                                set::value($task->module),
+                                set::items($moduleOptions),
+                                set::width(2/3),
+                                set::required(true)
+                            )
+                        ),
+                        div
+                        (
+                            setClass('flex'),
+                            checkbox(
+                                setID('showAllModule'),
+                                set::rootClass('items-center ml-3'),
+                                set::name('showAllModule'),
+                                set::text($lang->all),
+                                set::value(1),
+                                set::checked($showAllModule),
+                                on::change('loadAllModule')
+                            )
                         )
                     )
                 )
@@ -276,11 +280,15 @@ detailBody
             item
             (
                 set::name($lang->task->pri),
-                priPicker
+                set::required(strpos(",{$this->config->task->edit->requiredFields},", ",pri,") !== false),
+                formGroup
                 (
-                    set::name('pri'),
-                    set::value($task->pri),
-                    set::items($priOptions),
+                    priPicker
+                    (
+                        set::name('pri'),
+                        set::value($task->pri),
+                        set::items($priOptions),
+                    )
                 )
             ),
             item
@@ -376,24 +384,33 @@ detailBody
             item
             (
                 set::name($lang->task->estStarted),
-                datePicker
+                set::required(strpos(",{$this->config->task->edit->requiredFields},", ",estStarted,") !== false),
+                formGroup
                 (
-                    set::name('estStarted'),
-                    helper::isZeroDate($task->estStarted) ? null : set::value($task->estStarted)
+                    datePicker
+                    (
+                        set::name('estStarted'),
+                        helper::isZeroDate($task->estStarted) ? null : set::value($task->estStarted)
+                    )
                 )
             ),
             item
             (
                 set::name($lang->task->deadline),
-                datePicker
+                set::required(strpos(",{$this->config->task->edit->requiredFields},", ",deadline,") !== false),
+                formGroup
                 (
-                    set::name('deadline'),
-                    helper::isZeroDate($task->deadline) ? null : set::value($task->deadline)
+                    datePicker
+                    (
+                        set::name('deadline'),
+                        helper::isZeroDate($task->deadline) ? null : set::value($task->deadline)
+                    )
                 )
             ),
             item
             (
                 set::name($lang->task->estimate),
+                set::required(strpos(",{$this->config->task->edit->requiredFields},", ",estimate,") !== false),
                 inputControl
                 (
                     input