diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index ca6dcf5da..44dba45b2 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -63,7 +63,6 @@ class ClassProvider implements ServiceProviderInterface
             'TaskPermission',
             'TaskPosition',
             'TaskStatus',
-            'TaskValidator',
             'TaskImport',
             'TaskMetadata',
             'Transition',
@@ -87,6 +86,7 @@ class ClassProvider implements ServiceProviderInterface
         ),
         'Validator' => array(
             'PasswordResetValidator',
+            'TaskValidator',
             'UserValidator',
         ),
         'Core' => array(
diff --git a/app/Model/TaskValidator.php b/app/Validator/TaskValidator.php
similarity index 99%
rename from app/Model/TaskValidator.php
rename to app/Validator/TaskValidator.php
index 683cb0b19..c18a9761f 100644
--- a/app/Model/TaskValidator.php
+++ b/app/Validator/TaskValidator.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Kanboard\Model;
+namespace Kanboard\Validator;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 
 /**
- * Task validator model
+ * Task Validator
  *
- * @package  model
+ * @package  validator
  * @author   Frederic Guillot
  */
 class TaskValidator extends Base