diff --git a/module/bug/model.php b/module/bug/model.php
index b6802cef13..7683e0f71d 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -511,6 +511,7 @@ class bugModel extends model
             ->setDefault('openedBuild', '')
             ->setDefault('plan', 0)
             ->setDefault('deadline', '0000-00-00')
+            ->setDefault('resolvedDate', '0000-00-00 00:00:00')
             ->setIF(strpos($this->config->bug->edit->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
             ->add('lastEditedBy',   $this->app->user->account)
             ->add('lastEditedDate', $now)
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 67d02fe166..4d569780f7 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -211,7 +211,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <th><?php echo $lang->bug->resolvedDate;?></th>
-            <td><?php echo html::input('resolvedDate', $bug->resolvedDate, 'class=form-control');?></td>
+            <td><?php echo html::input('resolvedDate', $bug->resolvedDate, "class='form-control form-datetime'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->bug->resolvedBuild;?></th>
@@ -236,7 +236,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
           </tr>
           <tr>
             <th><?php echo $lang->bug->closedDate;?></th>
-            <td><?php echo html::input('closedDate', $bug->closedDate, 'class=form-control');?></td>
+            <td><?php echo html::input('closedDate', $bug->closedDate, "class='form-control form-datetime'");?></td>
           </tr>
         </table>
       </fieldset>