diff --git a/module/todo/model.php b/module/todo/model.php
index 4194104b51..d25fb1bd4d 100644
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -252,7 +252,7 @@ class todoModel extends model
             ->remove(implode(',', $this->config->todo->moduleList) . ',uid')
             ->get();
 
-        if($todo->type != 'custom' and $todo->type != 'cycle')
+        if(in_array($todo->type, $this->config->todo->moduleList))
         {
             $type   = $todo->type;
             $object = $this->loadModel($type)->getByID($objectType);
@@ -330,7 +330,7 @@ class todoModel extends model
                 $todo->type   = $data->types[$todoID];
                 $todo->pri    = $data->pris[$todoID];
                 $todo->status = $data->status[$todoID];
-                $todo->name   = ($todo->type == 'custom' or $todo->type == 'cycle' or $todo->type == 'feedback') ? $data->names[$todoID] : '';
+                $todo->name   = !in_array($todo->type, $this->config->todo->moduleList) ? $data->names[$todoID] : '';
                 $todo->begin  = isset($data->begins[$todoID]) ? $data->begins[$todoID] : 2400;
                 $todo->end    = isset($data->ends[$todoID]) ? $data->ends[$todoID] : 2400;
 
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 321df5cfd2..bcd65fdc2f 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -69,7 +69,7 @@
           <div id='<?php echo "nameBox" . $todo->id;?>' class='hidden'><?php echo html::input("names[$todo->id]", $todo->name, "class='text-left form-control hiddenwin'"); ?></div>
           <div class='<?php echo "nameBox" . $todo->id;?> text-left'>
           <?php
-          if($todo->type == 'custom' or $todo->type == 'cycle')
+          if(!in_array($todo->type, $this->config->todo->moduleList))
           {
               echo html::input("names[$todo->id]", $todo->name, "class='form-control'");
           }