diff --git a/website/client-old/js/controllers/tasksCtrl.js b/website/client-old/js/controllers/tasksCtrl.js
index 26d57b7413..93a206e5f6 100644
--- a/website/client-old/js/controllers/tasksCtrl.js
+++ b/website/client-old/js/controllers/tasksCtrl.js
@@ -42,6 +42,11 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
       User.addTask({
         body: tasks,
       });
+
+      if (User.user.preferences.newTaskEdit) {
+        var taskToEdit = tasks[tasks.length -1];
+        $scope.editTask(taskToEdit, User.user, Shared.taskClasses(taskToEdit, User.user.filters, User.user.preferences.dayStart, User.user.lastCron, listDef.showCompleted, main));
+      }
     }
 
     $scope.addTask = function(listDef) {
diff --git a/website/client-old/js/services/taskServices.js b/website/client-old/js/services/taskServices.js
index 1a8cdb69fa..52d131fea8 100644
--- a/website/client-old/js/services/taskServices.js
+++ b/website/client-old/js/services/taskServices.js
@@ -266,6 +266,8 @@ angular.module('habitrpg')
         modalScope.canEdit = scopeInc.canEdit;
         modalScope.updateTaskTags = scopeInc.updateTaskTags;
         modalScope.obj = scopeInc.obj;
+        modalScope.unlink = scopeInc.unlink;
+        modalScope.removeTask = scopeInc.removeTask;
       }
       modalScope.cancelTaskEdit = cancelTaskEdit;
 
diff --git a/website/views/shared/tasks/edit/index.jade b/website/views/shared/tasks/edit/index.jade
index 9ab3ce86bb..96c138667b 100644
--- a/website/views/shared/tasks/edit/index.jade
+++ b/website/views/shared/tasks/edit/index.jade
@@ -7,30 +7,30 @@ div(ng-if='task._editing')
       div(ng-if='task.challenge.broken=="TASK_DELETED" || task.challenge.broken=="CHALLENGE_TASK_NOT_FOUND"')
         p=env.t('brokenTask')
         p
-          a(ng-click='unlink(task, "keep")')=env.t('keepIt')
+          a(ng-click='unlink(task, "keep"); $close()')=env.t('keepIt')
           |   
-          a(ng-click="removeTask(task, obj)")=env.t('removeIt')
+          a(ng-click="removeTask(task, obj); $close()")=env.t('removeIt')
       div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"')
         p
           | 
           =env.t('brokenChallenge')
         p
-          a(ng-click='unlink(task, "keep-all")')=env.t('keepThem')
+          a(ng-click='unlink(task, "keep-all"); $close()')=env.t('keepThem')
           |  | 
-          a(ng-click='unlink(task, "remove-all")')=env.t('removeThem')
+          a(ng-click='unlink(task, "remove-all"); $close()')=env.t('removeThem')
       div(ng-if='task.challenge.broken=="CHALLENGE_CLOSED"')
         p
           !=env.t('challengeCompleted', {user: "{{task.challenge.winner}}"})
         p
-          a(ng-click='unlink(task, "keep-all")')=env.t('keepThem')
+          a(ng-click='unlink(task, "keep-all"); $close()')=env.t('keepThem')
           |  | 
-          a(ng-click='unlink(task, "remove-all")')=env.t('removeThem')
+          a(ng-click='unlink(task, "remove-all"); $close()')=env.t('removeThem')
       //div(ng-if='task.challenge.broken=="UNSUBSCRIBED"')
         p=env.t('unsubChallenge')
         p
-          a(ng-click="unlink(task, 'keep-all')")=env.t('keepThem')
+          a(ng-click="unlink(task, 'keep-all'); $close()")=env.t('keepThem')
           |  | 
-          a(ng-click="unlink(task, 'remove-all')")=env.t('removeThem')
+          a(ng-click="unlink(task, 'remove-all'); $close()")=env.t('removeThem')
 
     include ./checklist
 
diff --git a/website/views/shared/tasks/meta_controls.jade b/website/views/shared/tasks/meta_controls.jade
index beddb0bb8c..557c998cb5 100644
--- a/website/views/shared/tasks/meta_controls.jade
+++ b/website/views/shared/tasks/meta_controls.jade
@@ -37,6 +37,7 @@
       |  
       span.glyphicon.glyphicon-pencil(ng-hide='task._editing')
     |  
+
     a(ng-hide='!task._editing', ng-click='cancelTaskEdit(task)', tooltip=env.t('cancel'))
       span.glyphicon.glyphicon-remove(ng-hide='!task._editing')
       |  
@@ -45,18 +46,18 @@
     a(ng-hide='!task._editing', ng-click='saveTask(task)', tooltip=env.t('save'))
       span.glyphicon.glyphicon-ok(ng-hide='!task._editing')
     |  
-    
+  
     //challenges
     span(ng-if='task.challenge.id')
       span(ng-if='task.challenge.broken')
-        a.glyphicon.glyphicon-bullhorn(style='background-color:red;', ng-click='task._editing = true', tooltip=env.t('brokenChaLink') tooltip-placement='right')
+        a.glyphicon.glyphicon-bullhorn(style='background-color:red;', ng-click='editTask(task, user, Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main))', tooltip=env.t('brokenChaLink') tooltip-placement='right')
         |  
       span(ng-if='!task.challenge.broken')
         span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge'))
         |  
         
     // delete
-    a(ng-if='!task.challenge.id || obj.leader._id === User.user._id', ng-hide="(checkGroupAccess && !checkGroupAccess(obj))" ng-click='removeTask(task, obj)', tooltip=env.t('delete'))
+    a(ng-if='!task.challenge.id', ng-hide="(checkGroupAccess && !checkGroupAccess(obj))" ng-click='removeTask(task, obj)', tooltip=env.t('delete'))
       span.glyphicon.glyphicon-trash
       |