diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
index d569a0819..5e5c04f29 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
@@ -404,6 +404,9 @@ public class AllocationRowsHandler {
         for (AllocationRow each : currentRows) {
             result.addAll(each.getAssociatedResources());
         }
+        for (ResourceAllocation<?> each : requestedToRemove) {
+            result.addAll(each.getAssociatedResources());
+        }
         return result;
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
index be4eb0702..e2983825b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
@@ -304,6 +304,8 @@ public class PlanningStateCreator {
     private IScenarioInfo buildScenarioInfo(Order orderReloaded) {
         Scenario currentScenario = scenarioManager.getCurrent();
         if (orderReloaded.isUsingTheOwnerScenario()) {
+            switchAllocationsToScenario(currentScenario,
+                    orderReloaded.getAssociatedTaskElement());
             return new UsingOwnerScenario(currentScenario, orderReloaded);
         }
         final List<DayAssignment> previousAssignments = orderReloaded
@@ -323,6 +325,9 @@ public class PlanningStateCreator {
 
     private static void switchAllocationsToScenario(Scenario scenario,
             TaskElement task) {
+        if (task == null) {
+            return;
+        }
         for (ResourceAllocation<?> each : task.getAllResourceAllocations()) {
             each.switchToScenario(scenario);
         }