diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/Autocomplete.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/Autocomplete.java
index ca9578897..d9eb4ae9f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/Autocomplete.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/Autocomplete.java
@@ -20,8 +20,6 @@
 
 package org.navalplanner.web.common.components;
 
-import static org.navalplanner.web.I18nHelper._;
-
 import java.util.List;
 
 import javax.servlet.ServletContext;
@@ -32,7 +30,6 @@ import org.navalplanner.web.common.components.finders.IFinder;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.zkoss.zk.ui.Executions;
-import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Combobox;
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 a1a892c26..9a4ffdde4 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
@@ -669,6 +669,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     public void reloadDefaultTab() {
+        setSelectedExternalCompany();
         Tabpanel tabPanel = (Tabpanel) editWindow
                 .getFellow("tabPanelGeneralData");
         Util.createBindingsFor(tabPanel);