diff --git a/website/client/components/tasks/column.vue b/website/client/components/tasks/column.vue
index 4d8fa21933..6d26341a0a 100644
--- a/website/client/components/tasks/column.vue
+++ b/website/client/components/tasks/column.vue
@@ -362,7 +362,7 @@ export default {
           type: this.type,
           filterType: this.activeFilter.label,
         }) :
-        this.filterByCompleted(this.taskListOverride, this.activeFilter.label);
+        this.filterByLabel(this.taskListOverride, this.activeFilter.label);
 
       let taggedList = this.filterByTagList(filteredTaskList, this.selectedTags);
       let searchedList = this.filterBySearchText(taggedList, this.searchText);
@@ -598,10 +598,12 @@ export default {
         }
       });
     },
-    filterByCompleted (taskList, filter) {
+    filterByLabel (taskList, filter) {
       if (!taskList) return [];
       return taskList.filter(task => {
         if (filter === 'complete2') return task.completed;
+        if (filter === 'due') return task.isDue;
+        if (filter === 'notDue') return !task.isDue;
         return !task.completed;
       });
     },
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index c824c06c28..2c31d46cd3 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -923,17 +923,18 @@ export default {
 
       if (this.purpose === 'create') {
         if (this.challengeId) {
-          this.$store.dispatch('tasks:createChallengeTasks', {
+          const response = await this.$store.dispatch('tasks:createChallengeTasks', {
             challengeId: this.challengeId,
             tasks: [this.task],
           });
+          Object.assign(this.task, response);
           this.$emit('taskCreated', this.task);
         } else if (this.groupId) {
-          await this.$store.dispatch('tasks:createGroupTasks', {
+          const response = await this.$store.dispatch('tasks:createGroupTasks', {
             groupId: this.groupId,
             tasks: [this.task],
           });
-
+          Object.assign(this.task, response);
           let promises = this.assignedMembers.map(memberId => {
             return this.$store.dispatch('tasks:assignTask', {
               taskId: this.task._id,