diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 2d2fa89444..a9c2422d74 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -32,14 +32,17 @@ function renderUserAvatar(user, objectType, objectID)
  */
 function renderDeadline(deadline)
 {
-    var date = $.zui.createDate(deadline);
-    var now = new Date();
+    if(deadline == '0000-00-00') return;
+
+    var date  = $.zui.createDate(deadline);
+    var now   = new Date();
     now.setHours(0);
     now.setMinutes(0);
     now.setSeconds(0);
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
-    return $('<span class="info info-deadline"/>').text(deadline).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
+    var deadlineDate = $.zui.formatDate(date, 'MM-dd')
+    return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
 }
 
 /**
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 3f5850c713..58aff40c02 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -145,4 +145,5 @@ js::set('priv',
 <?php js::set('setWIP', $lang->execution->setWIP);?>
 <?php js::set('sortColumn', $lang->execution->sortColumn);?>
 <?php js::set('kanbanLang', $lang->kanban);?>
+<?php js::set('deadlineLang', $lang->task->deadlineAB);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/kanban/model.php b/module/kanban/model.php
index e38463f858..758a0efe94 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -104,7 +104,7 @@ class kanbanModel extends model
                     $cardData['pri']        = $object->pri ? $object->pri : '';
                     $cardData['estimate']   = $lane->type == 'bug' ? '' : $object->estimate;
                     $cardData['assignedTo'] = $object->assignedTo;
-                    $cardData['deadline']   = $lane->type == 'task' ? $object->deadline : '';
+                    $cardData['deadline']   = $lane->type == 'story' ? '' : $object->deadline;
                     $cardData['severity']   = $lane->type == 'bug' ? $object->severity : '';
 
                     if($lane->type == 'task')