diff --git a/website/client/js/controllers/filtersCtrl.js b/website/client/js/controllers/filtersCtrl.js
index 8373faa51c..4a3ed6e59c 100644
--- a/website/client/js/controllers/filtersCtrl.js
+++ b/website/client/js/controllers/filtersCtrl.js
@@ -30,6 +30,7 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared',
       } else {
         user.filters[tag.id] = !user.filters[tag.id];
       }
+
       // no longer persisting this, it was causing a lot of confusion - users thought they'd permanently lost tasks
       // Note: if we want to persist for just this computer, easy method is:
       // User.save();
diff --git a/website/client/js/controllers/tasksCtrl.js b/website/client/js/controllers/tasksCtrl.js
index a2835256e2..69d8949c74 100644
--- a/website/client/js/controllers/tasksCtrl.js
+++ b/website/client/js/controllers/tasksCtrl.js
@@ -33,9 +33,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
       var newTask = {
         text: task,
         type: listDef.type,
-        // tags: _.transform(User.user.filters, function(m, v, k) {
-        //  if (v) m.push(v);
-        // }),
+        tags: _.keys(User.user.filters),
       };
 
       User.addTask({body: newTask});
@@ -272,4 +270,21 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
         $rootScope.playSound('Reward');
       }
     }
+
+    /*
+    ------------------------
+    Tags
+    ------------------------
+    */
+
+    $scope.updateTaskTags = function (tagId, task) {
+      var tagIndex = task.tags.indexOf(tagId);
+      if (tagIndex === -1) {
+        Tasks.addTagToTask(task._id, tagId);
+        task.tags.push(tagId);
+      } else {
+        Tasks.removeTagFromTask(task._id, tagId);
+        task.tags.splice(tagIndex, 0);
+      }
+    }
   }]);
diff --git a/website/views/shared/tasks/edit/tags.jade b/website/views/shared/tasks/edit/tags.jade
index 0e9283fdb2..8abcedc355 100644
--- a/website/views/shared/tasks/edit/tags.jade
+++ b/website/views/shared/tasks/edit/tags.jade
@@ -1,5 +1,5 @@
 fieldset.option-group(ng-if='!$state.includes("options.social.challenges")')
   p.option-title.mega(ng-class='{active: task._tags}', ng-click='task._tags = !task._tags', tooltip=env.t('expandCollapse'))=env.t('tags')
   label.checkbox(ng-repeat='tag in user.tags', ng-if='task._tags')
-    input(type='checkbox', ng-model='task.tags[tag.id]', ng-checked="task.tags.indexOf(tag.id) !== -1")
+    input(type='checkbox', ng-checked="task.tags.indexOf(tag.id) !== -1", ng-click="updateTaskTags(tag.id, task)")
     markdown(text='tag.name')