diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
index 3ca575b63..6c9b5746c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
@@ -56,6 +56,7 @@ import org.zkoss.zk.ui.util.Composer;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
+import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.SimpleListModel;
@@ -146,9 +147,7 @@ public class CompanyPlanningController implements Composer {
             cbProgressTypes = (Combobox) planner.getFellow("cbProgressTypes");
         }
         cbProgressTypes.setModel(new SimpleListModel(ProgressType.getAll()));
-
-        // FIXME: Select default configuration option
-        // cbProgressTypes.renderAll();
+        cbProgressTypes.setItemRenderer(new ProgressTypeRenderer());
         cbProgressTypes.invalidate();
         Comboitem item = findListitemValue(cbProgressTypes,
                 getProgressTypeFromConfiguration());
@@ -173,6 +172,15 @@ public class CompanyPlanningController implements Composer {
         cbProgressTypes.setVisible(true);
     }
 
+    private class ProgressTypeRenderer implements ComboitemRenderer {
+
+        @Override
+        public void render(Comboitem item, Object data) throws Exception {
+            ProgressType progressType = (ProgressType) data;
+            item.setLabel(_(progressType.getValue()));
+        }
+    }
+
     private Comboitem findListitemValue(Combobox listbox, ProgressType value) {
         for (Object each : listbox.getChildren()) {
             final Comboitem item = (Comboitem) each;