diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index e339aa34d1..6cec5cb94c 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -160,7 +160,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->deadline;?></th>
-                  <td><?php echo html::input('deadline', helper::isZeroDate($bug->deadline) ? '' : substr($bug->deadline, 5, 11), "class='form-control form-date'");?></td>
+                  <td><?php echo html::input('deadline', helper::isZeroDate($bug->deadline) ? '' : $bug->deadline, "class='form-control form-date'");?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->feedbackBy;?></th>
diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index 2b5c374680..df5a1d9368 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -1,6 +1,7 @@
 td.delayed {background: #e84e0f !important; color: white;}
 #int-dropdown {margin-left: -8px; border-radius: 4px; border: 1px solid #0c64eb;}
 #projectTaskForm table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+th.c-deadline {text-align: center;}
 .table td.c-estimate, .table td.c-consumed, .table td.c-left {padding-right: 12px;}
 .c-estimate {text-align: right;}
 .c-consumed {text-align: right;}
diff --git a/module/task/model.php b/module/task/model.php
index 9bac6c7e02..af4aa9ab5b 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3408,7 +3408,7 @@ class taskModel extends model
             if($id == 'status') $class .= ' task-' . $task->status;
             if($id == 'id')     $class .= ' cell-id';
             if($id == 'name')   $class .= ' text-left';
-            if($id == 'deadline') $class .= ' text-left';
+            if($id == 'deadline') $class .= ' text-center';
             if($id == 'deadline' and isset($task->delay)) $class .= ' delayed';
             if($id == 'assignedTo') $class .= ' has-btn text-left';
             if($id == 'lane') $class .= ' text-left';