diff --git a/src/app/doctype/controllers/DoctypeController.php b/src/app/doctype/controllers/DoctypeController.php
index cb8a2c3f3291b79ca4f7174b2e11bf4f7cfdebb4..8f2070f61cd9fd31ae268607b68cea1685bd678a 100644
--- a/src/app/doctype/controllers/DoctypeController.php
+++ b/src/app/doctype/controllers/DoctypeController.php
@@ -362,19 +362,16 @@ class DoctypeController
             !Validator::intVal()->validate($aArgs['doctypes_second_level_id'])) {
             $errors[]= 'Invalid doctypes_second_level_id value';
         }
-        if (!Validator::notEmpty()->validate($aArgs['process_delay']) ||
-            !Validator::intVal()->validate($aArgs['process_delay']) ||
-            $aArgs['process_delay'] < 0) {
+        if (!Validator::notEmpty()->validate($aArgs['process_delay']) &&
+            (!Validator::intVal()->validate($aArgs['process_delay']) || $aArgs['process_delay'] < 0)) {
             $errors[]= 'Invalid process_delay value';
         }
-        if (!Validator::notEmpty()->validate($aArgs['delay1']) ||
-            !Validator::intVal()->validate($aArgs['delay1']) ||
-            $aArgs['delay1'] < 0) {
+        if (!Validator::notEmpty()->validate($aArgs['delay1']) &&
+            (!Validator::intVal()->validate($aArgs['delay1']) || $aArgs['delay1'] < 0)) {
             $errors[]= 'Invalid delay1 value';
         }
-        if (!Validator::notEmpty()->validate($aArgs['delay2']) ||
-            !Validator::intVal()->validate($aArgs['delay2']) ||
-            $aArgs['delay2'] < 0) {
+        if (!Validator::notEmpty()->validate($aArgs['delay2']) &&
+            (!Validator::intVal()->validate($aArgs['delay2']) || $aArgs['delay2'] < 0)) {
             $errors[]= 'Invalid delay2 value';
         }
         if (Validator::notEmpty()->validate($aArgs['duration_current_use']) &&
diff --git a/src/app/doctype/models/DoctypeExtModelAbstract.php b/src/app/doctype/models/DoctypeExtModelAbstract.php
index 989aeccfd8c61f08abd7bffcc630169118c9fdc1..03b108d3650230e737c1b1eb264c7d2210cef401 100644
--- a/src/app/doctype/models/DoctypeExtModelAbstract.php
+++ b/src/app/doctype/models/DoctypeExtModelAbstract.php
@@ -42,8 +42,8 @@ class DoctypeExtModelAbstract
 
     public static function create(array $aArgs)
     {
-        ValidatorModel::notEmpty($aArgs, ['type_id', 'process_delay', 'delay1', 'delay2', 'process_mode']);
-        ValidatorModel::intVal($aArgs, ['type_id', 'process_delay', 'delay1', 'delay2']);
+        ValidatorModel::notEmpty($aArgs, ['type_id', 'process_mode']);
+        ValidatorModel::intVal($aArgs, ['type_id']);
 
         DatabaseModel::insert([
             'table'         => 'mlb_doctype_ext',
@@ -55,8 +55,8 @@ class DoctypeExtModelAbstract
 
     public static function update(array $aArgs)
     {
-        ValidatorModel::notEmpty($aArgs, ['type_id', 'process_delay', 'delay1', 'delay2', 'process_mode']);
-        ValidatorModel::intVal($aArgs, ['type_id', 'process_delay', 'delay1', 'delay2']);
+        ValidatorModel::notEmpty($aArgs, ['type_id', 'process_mode']);
+        ValidatorModel::intVal($aArgs, ['type_id']);
         
         DatabaseModel::update([
             'table'     => 'mlb_doctype_ext',