diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
index c7e98c0dc..dc151b5ca 100644
--- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
+++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
@@ -60,8 +60,8 @@
           <tbody>
             <tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
               <td>
-                <a ng-if="!$ctrl.agentProxy || !item.Container" ui-sref="docker.tasks.task({id: item.Id})" class="monospaced">{{ item.Id }}</a>
-                <a ng-if="$ctrl.agentProxy && item.Container" ui-sref="docker.containers.container({ id: item.Container.Id, nodeName: item.Container.NodeName })" class="monospaced">{{ item.Id }}</a>
+                <a ng-if="!$ctrl.agentProxy || !item.Container" ui-sref="docker.tasks.task({id: item.Id})" class="monospaced">{{ item.Service.Name }}{{ item.Slot ? '.' + item.Slot : '' }}{{ '.' + item.Id }}</a>
+                <a ng-if="$ctrl.agentProxy && item.Container" ui-sref="docker.containers.container({ id: item.Container.Id, nodeName: item.Container.NodeName })" class="monospaced">{{ item.Service.Name }}{{ item.Slot ? '.' + item.Slot : '' }}{{ '.' + item.Id }}</a>
               </td>
               <td><span class="label label-{{ item.Status.State | taskstatusbadge }}">{{ item.Status.State }}</span></td>
               <td ng-if="$ctrl.showSlotColumn">{{ item.Slot ? item.Slot : '-' }}</td>
diff --git a/app/docker/helpers/serviceHelper.js b/app/docker/helpers/serviceHelper.js
index 551706d37..3a170556a 100644
--- a/app/docker/helpers/serviceHelper.js
+++ b/app/docker/helpers/serviceHelper.js
@@ -11,6 +11,7 @@ angular.module('portainer.docker')
       var task = tasks[i];
       if (task.ServiceId === service.Id) {
         service.Tasks.push(task);
+        task.Service = service;
       } else {
         otherServicesTasks.push(task);
       }
diff --git a/app/docker/views/services/edit/includes/tasks.html b/app/docker/views/services/edit/includes/tasks.html
index 6730948aa..703317187 100644
--- a/app/docker/views/services/edit/includes/tasks.html
+++ b/app/docker/views/services/edit/includes/tasks.html
@@ -7,6 +7,6 @@
     show-text-filter="true"
     show-slot-column="service.Mode !== 'global'"
     show-logs-button="applicationState.endpoint.apiVersion >= 1.30"
-    agent-powered="applicationState.endpoint.mode.agentProxy"
+    agent-proxy="applicationState.endpoint.mode.agentProxy"
   ></tasks-datatable>
 </div>
diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js
index 93505cb8f..ffce87b3b 100644
--- a/app/docker/views/services/edit/serviceController.js
+++ b/app/docker/views/services/edit/serviceController.js
@@ -413,9 +413,10 @@ function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll,
     var apiVersion = $scope.applicationState.endpoint.apiVersion;
     var agentProxy = $scope.applicationState.endpoint.mode.agentProxy;
 
+    var service = null;
     ServiceService.service($transition$.params().id)
     .then(function success(data) {
-      var service = data;
+      service = data;
       $scope.isUpdating = $scope.lastVersion >= service.Version;
       if (!$scope.isUpdating) {
         $scope.lastVersion = service.Version;
@@ -460,6 +461,8 @@ function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll,
         }
       }
 
+      ServiceHelper.associateTasksToService(service, tasks);
+
       $scope.tasks = data.tasks;
 
 
diff --git a/app/docker/views/stacks/edit/stack.html b/app/docker/views/stacks/edit/stack.html
index b14dcdd61..931ba087b 100644
--- a/app/docker/views/stacks/edit/stack.html
+++ b/app/docker/views/stacks/edit/stack.html
@@ -42,7 +42,7 @@
       show-text-filter="true"
       show-slot-column="true"
       show-logs-button="applicationState.endpoint.apiVersion >= 1.30"
-      agent-powered="applicationState.endpoint.mode.agentProxy"
+      agent-proxy="applicationState.endpoint.mode.agentProxy"
     ></tasks-datatable>
   </div>
 </div>
diff --git a/app/docker/views/stacks/edit/stackController.js b/app/docker/views/stacks/edit/stackController.js
index e6b5f8b9f..cb09c398f 100644
--- a/app/docker/views/stacks/edit/stackController.js
+++ b/app/docker/views/stacks/edit/stackController.js
@@ -67,11 +67,6 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe
       var services = data.services;
       var tasks = data.tasks;
 
-      for (var i = 0; i < services.length; i++) {
-        var service = services[i];
-        ServiceHelper.associateTasksToService(service, tasks);
-      }
-
       if (agentProxy) {
         var containers = data.containers;
         for (var j = 0; j < tasks.length; j++) {
@@ -80,6 +75,11 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe
         }
       }
 
+      for (var i = 0; i < services.length; i++) {
+        var service = services[i];
+        ServiceHelper.associateTasksToService(service, tasks);
+      }
+
       $scope.tasks = tasks;
       $scope.services = services;
     })