diff --git a/module/holiday/model.php b/module/holiday/model.php
index 45b52344d4..bd62164736 100644
--- a/module/holiday/model.php
+++ b/module/holiday/model.php
@@ -65,6 +65,8 @@ class holidayModel extends model
     {
         $holiday = fixer::input('post')->get();
         $holiday->year = substr($holiday->begin, 0, 4);
+        if(helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin);
+        if(helper::isZeroDate($holiday->end))  return dao::$errors['end'][]   = sprintf($this->lang->error->date, $this->lang->holiday->end);
 
         $this->dao->insert(TABLE_HOLIDAY)->data($holiday)
             ->autoCheck()
@@ -97,6 +99,8 @@ class holidayModel extends model
     {
         $holiday = fixer::input('post')->get();
         $holiday->year = substr($holiday->begin, 0, 4);
+        if(helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin);
+        if(helper::isZeroDate($holiday->end))  return dao::$errors['end'][]   = sprintf($this->lang->error->date, $this->lang->holiday->end);
 
         $this->dao->update(TABLE_HOLIDAY)
             ->data($holiday)
diff --git a/module/holiday/view/create.html.php b/module/holiday/view/create.html.php
index 4e57f85bcb..f764d14933 100644
--- a/module/holiday/view/create.html.php
+++ b/module/holiday/view/create.html.php
@@ -28,17 +28,17 @@
         </tr>
         <tr>
           <th><?php echo $lang->holiday->begin;?></th>
-          <td><?php echo html::input('begin', '', "class='form-control form-date'");?></td>
+          <td><?php echo html::input('begin', '', "class='form-control form-date' required");?></td>
           <td></td>
         </tr>
         <tr>
           <th><?php echo $lang->holiday->end;?></th>
-          <td><?php echo html::input('end', '', "class='form-control form-date'");?></td>
+          <td><?php echo html::input('end', '', "class='form-control form-date' required");?></td>
           <td></td>
         </tr>
         <tr>
           <th><?php echo $lang->holiday->name;?></th>
-          <td><?php echo html::input('name', '', "class='form-control'");?></td>
+          <td><?php echo html::input('name', '', "class='form-control' required");?></td>
           <td></td>
         </tr>
         <tr>
diff --git a/module/holiday/view/edit.html.php b/module/holiday/view/edit.html.php
index 23df717e63..bcb7e739f6 100644
--- a/module/holiday/view/edit.html.php
+++ b/module/holiday/view/edit.html.php
@@ -28,17 +28,17 @@
         </tr>
         <tr>
           <th><?php echo $lang->holiday->begin?></th>
-          <td><?php echo html::input('begin', $holiday->begin, "class='form-control form-date'")?></td>
+          <td><?php echo html::input('begin', $holiday->begin, "class='form-control form-date' required")?></td>
           <td></td>
         </tr>
         <tr>
           <th><?php echo $lang->holiday->end?></th>
-          <td><?php echo html::input('end', $holiday->end, "class='form-control form-date'")?></td>
+          <td><?php echo html::input('end', $holiday->end, "class='form-control form-date' required")?></td>
           <td></td>
         </tr>
         <tr>
           <th><?php echo $lang->holiday->name?></th>
-          <td><?php echo html::input('name', $holiday->name, "class='form-control'")?></td>
+          <td><?php echo html::input('name', $holiday->name, "class='form-control' required")?></td>
           <td></td>
         </tr>
         <tr>