diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
index 49e86225d..be9d68c98 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
@@ -59,7 +59,6 @@ public class AssignedLabelsToOrderElementController extends
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
-        comp.setVariable("assignedLabelsController", this, true);
     }
 
     public void openWindow(IOrderElementModel orderElementModel) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index ca793a684..b3d80dd94 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -43,6 +43,7 @@ import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.OnlyOneVisible;
 import org.navalplanner.web.common.Util;
+import org.navalplanner.web.orders.labels.LabelsAssignmentComponent;
 import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
 import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent;
 import org.navalplanner.web.planner.order.IOrderPlanningGate;
@@ -218,9 +219,9 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void setupAssignedLabelsToOrderElementController(Component comp)
     throws Exception {
-        Component orderElementLabels = editWindow.getFellowIfAny("orderElementLabels");
-        assignedLabelsController = (AssignedLabelsToOrderElementController)
-            orderElementLabels.getVariable("assignedLabelsController", true);
+        LabelsAssignmentComponent labelsAssignment = (LabelsAssignmentComponent) editWindow
+                .getFellow("orderElementLabels");
+        assignedLabelsController = labelsAssignment.getController();
     }
 
     private AssignedCriterionRequirementToOrderElementController assignedCriterionRequirementController;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index f9f21976d..22b0573fa 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -25,6 +25,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderLine;
 import org.navalplanner.business.orders.entities.OrderLineGroup;
 import org.navalplanner.web.common.Util;
+import org.navalplanner.web.orders.labels.LabelsAssignmentComponent;
 import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
 import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent;
 import org.zkoss.zk.ui.Component;
@@ -60,7 +61,7 @@ public class OrderElementController extends GenericForwardComposer {
 
     private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
 
-    private Component orderElementLabels;
+    private LabelsAssignmentComponent orderElementLabels;
 
     private AssignedLabelsToOrderElementController assignedLabelsController;
 
@@ -104,8 +105,7 @@ public class OrderElementController extends GenericForwardComposer {
 
     private void setupAssignedLabelsToOrderElementController(Component comp)
             throws Exception {
-        assignedLabelsController = (AssignedLabelsToOrderElementController)
-        orderElementLabels.getVariable("assignedLabelsController", true);
+        assignedLabelsController = orderElementLabels.getController();
     }
 
     private void setupAssignedCriterionRequirementToOrderElementController(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java
new file mode 100644
index 000000000..c0eb889ac
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java
@@ -0,0 +1,37 @@
+/*
+ * This file is part of ###PROJECT_NAME###
+ *
+ * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+ *                    Desenvolvemento Tecnolóxico de Galicia
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.navalplanner.web.orders.labels;
+
+import org.navalplanner.web.orders.AssignedLabelsToOrderElementController;
+import org.zkoss.zk.ui.HtmlMacroComponent;
+
+/**
+ * @author Óscar González Fernández <ogonzalez@igalia.com>
+ *
+ */
+public class LabelsAssignmentComponent extends HtmlMacroComponent {
+
+    private AssignedLabelsToOrderElementController controller = new AssignedLabelsToOrderElementController();
+
+    public AssignedLabelsToOrderElementController getController() {
+        return controller;
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index f158dd8a0..f6d9519ff 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -21,7 +21,7 @@
 <?component name="orderElementDetails" inline="true" macroURI="_orderElementDetails.zul"?>
 <?component name="listOrderElementHours" inline="true" macroURI="_listOrderElementHours.zul"?>
 <?component name="listOrderElementAdvances" inline="true" macroURI="_listOrderElementAdvances.zul"?>
-<?component name="listOrderElementLabels" inline="true" macroURI="_listOrderElementLabels.zul"?>
+<?component name="listOrderElementLabels" class="org.navalplanner.web.orders.labels.LabelsAssignmentComponent" macroURI="components/_listOrderElementLabels.zul"?>
 <?component name="listOrderElementCriterionRequirements" inline="true" macroURI="_listOrderElementCriterionRequirements.zul"?>
 <?component name="listOrderElementMaterials" class="org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent"
     macroURI="/orders/components/_listOrderElementMaterials.zul"?>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index 92d73deeb..950533a41 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -22,7 +22,7 @@
   class="org.navalplanner.web.orders.OrdersTreeComponent"?>
 <?component name="listOrderElementHours" inline="true" macroURI="_listOrderElementHours.zul"?>
 <?component name="listOrderElementAdvances" inline="true" macroURI="_listOrderElementAdvances.zul"?>
-<?component name="listOrderElementLabels" inline="true" macroURI="_listOrderElementLabels.zul"?>
+<?component name="listOrderElementLabels" class="org.navalplanner.web.orders.labels.LabelsAssignmentComponent" macroURI="components/_listOrderElementLabels.zul"?>
 <?component name="listOrderElementCriterionRequirements" inline="true" macroURI="_listOrderElementCriterionRequirements.zul"?>
 <?component name="listOrderElementMaterials" class="org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent"
     macroURI="/orders/components/_listOrderElementMaterials.zul"?>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul b/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
similarity index 96%
rename from navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
rename to navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
index 452bbc92b..aad8337a1 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
@@ -17,9 +17,12 @@
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
-<vbox id="${arg.id}"
-    apply="org.navalplanner.web.orders.AssignedLabelsToOrderElementController" >
+<zk>
+<zscript><![CDATA[
+    assignedLabelsController = self.controller;
+]]>
+</zscript>
+<vbox apply="${assignedLabelsController}" >
     <!-- Indirect labels -->
     <vbox>
         <panel title="${i18n:_('Indirect labels')}" border="normal">
@@ -96,3 +99,4 @@
         </panel>
     </vbox>
 </vbox>
+</zk>
\ No newline at end of file