diff --git a/public/css/tasks.styl b/public/css/tasks.styl
index 73894b3372..680fd1ce65 100644
--- a/public/css/tasks.styl
+++ b/public/css/tasks.styl
@@ -119,6 +119,10 @@ for $stage in $stages
   line-height: 1.4
   word-wrap: break-word
 
+// task due date (for to-dos)
+.task-date
+  font-size: 70%
+
 .habit-wide .task-text
   padding-left: 7em
 
diff --git a/src/middleware.js b/src/middleware.js
index 45209e6375..2b224ab85f 100644
--- a/src/middleware.js
+++ b/src/middleware.js
@@ -77,4 +77,4 @@ module.exports.locals = function(req, res, next) {
  //    # Set locale to bg on dev
  //    #model.set '_i18n.locale', 'bg' if process.env.NODE_ENV is "development"
  //    next()
- */
\ No newline at end of file
+ */
diff --git a/views/tasks/task.jade b/views/tasks/task.jade
index c1ce681284..a2a2abdcde 100644
--- a/views/tasks/task.jade
+++ b/views/tasks/task.jade
@@ -1,6 +1,9 @@
 li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,user.filters,user.preferences.dayStart,user.lastCron,list.showCompleted,list.main)}}', data-id='{{task.id}}')
   // right-hand side control buttons
   .task-meta-controls
+    // Due Date
+    span.task-date(ng-if='task.type=="todo" && task.date')
+      | {{task.date}}
     // Streak
     span(ng-show='task.streak') {{task.streak}}
       span(tooltip='Streak Counter')
@@ -126,7 +129,7 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use
       // if Todos, the due date
       fieldset.option-group(ng-if='task.type=="todo"')
         legend.option-title Due Date
-        input.option-content.datepicker(type='text', value='{{task.date}}', data-date-format='mm/dd/yyyy')
+        input.option-content.datepicker(type='text', data-date-format='mm/dd/yyyy', ng-model='task.date')
 
       fieldset.option-group(ng-if='list.main')
         legend.option-title Tags