diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
index c0499d69b..af26bf949 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
@@ -141,6 +141,8 @@ public class SubcontractModel implements ISubcontractModel {
                 }
 
                 task.removeAllSatisfiedResourceAllocations();
+                task.setDeadline(new LocalDate(currentSubcontractedTaskData
+                        .getLastRequiredDeliverDate()));
                 Task.convertOnStartInFixedDate(task);
             }
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
index b6f177fca..ad475fb10 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
@@ -99,6 +99,8 @@ public class TaskPropertiesController extends GenericForwardComposer {
 
     private Datebox endDateBox;
 
+    private Datebox deadLineDateBox;
+
     private Combobox startConstraintTypes;
 
     private Datebox startConstraintDate;
@@ -144,6 +146,7 @@ public class TaskPropertiesController extends GenericForwardComposer {
         startConstraintTypes.setDisabled(disabledConstraintsAndAllocations);
         startConstraintDate.setDisabled(disabledConstraintsAndAllocations);
         lbResourceAllocationType.setDisabled(disabledConstraintsAndAllocations);
+        deadLineDateBox.setDisabled(currentTaskElement.isSubcontracted());
 
         if (context != null) {
             taskEditFormComposer.init(context.getRelativeTo(), context.getTask());