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 8321502ec..20c3efbba 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
@@ -225,18 +225,11 @@ public class OrderElementController extends GenericForwardComposer {
         reloadSelectedCriterionTypes();
     }
 
-    /**
-     * Just close the {@link Popup}
-     */
-    public void cancel() {
-        popup.close();
-    }
-
     /**
      * Just close the {@link Popup} and refresh parent status. Save actions are
      * managed by "save-when" at .zul file.
      */
-    public void save() {
+    public void back() {
         popup.close();
         Util.reloadBindings(popup.getParent());
     }
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index 959336cc5..f7ae8d232 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -8,17 +8,17 @@
             <label value="Order Element Name" />
             <textbox id="name"
                 value="@{orderElementController.orderElement.name,
-                save-when='saveButton.onClick'}" />
+                save-when='backButton.onClick'}" />
         </hbox>
 
         <hbox>
             <label value="Init Date" />
             <datebox id="initDate"
                 value="@{orderElementController.orderElement.initDate,
-                save-when='saveButton.onClick'}" />
+                save-when='backButton.onClick'}" />
             <checkbox id="mandatoryInit"
                 checked="@{orderElementController.orderElement.mandatoryInit},
-                save-when='saveButton.onClick'" />
+                save-when='backButton.onClick'" />
             <label value="Mandatory" />
         </hbox>
 
@@ -26,10 +26,10 @@
             <label value="End Date" />
             <datebox id="endDate"
                 value="@{orderElementController.orderElement.endDate,
-                save-when='saveButton.onClick'}" />
+                save-when='backButton.onClick'}" />
             <checkbox id="mandatoryEnd"
                 checked="@{orderElementController.orderElement.mandatoryEnd,
-                save-when='saveButton.onClick'}" />
+                save-when='backButton.onClick'}" />
             <label value="Mandatory" />
         </hbox>
 
@@ -96,14 +96,12 @@
 
         <textbox id="description" rows="4"
             value="@{orderElementController.orderElement.description,
-            save-when='saveButton.onClick'}" />
+            save-when='backButton.onClick'}" />
 
         <hbox>
-            <button onClick="orderElementController.cancel();"
-                label="${arg.cancel_button_label}" />
-            <button id="saveButton"
-                onClick="orderElementController.save();"
-                label="${arg.save_button_label}" />
+            <button id="backButton"
+                onClick="orderElementController.back();"
+                label="${arg.back_button_label}" />
         </hbox>
 
     </vbox>
diff --git a/navalplanner-webapp/src/main/webapp/orders/orders.zul b/navalplanner-webapp/src/main/webapp/orders/orders.zul
index b4016582e..5f919cf06 100644
--- a/navalplanner-webapp/src/main/webapp/orders/orders.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/orders.zul
@@ -20,7 +20,7 @@
         <edition top_id="editWindow" title="Edit Personal Data"
             save_button_label="Save" cancel_button_label="Cancel" />
         <orderElementPopup top_id="editOrderElementPopup" title="Edit Order Element"
-            save_button_label="Save" cancel_button_label="Cancel" />
+            back_button_label="Back" />
         <window visible="@{controller.confirmingRemove}"
             id="confirmRemove" title="Confirmación" width="500px"
             position="center">