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 d9eb4ae9f..c91e70890 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
@@ -112,6 +112,13 @@ public class Autocomplete extends Combobox {
         }
     }
 
+    public void clear() {
+        this.setValue("");
+        this.setSelectedItem(null);
+        this.setModel(finder.getModel());
+        this.invalidate();
+    }
+
     private Object getBean(String classname) {
         HttpServletRequest servletRequest = (HttpServletRequest) Executions
                 .getCurrent().getNativeRequest();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
index 35f80bf25..0adef54b2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java
@@ -90,7 +90,7 @@ public class ExternalCompanyCRUDController extends GenericForwardComposer
     private void clearAutocompleteUser() {
         Autocomplete user = (Autocomplete) createWindow.getFellowIfAny("user");
         if (user != null) {
-            user.setValue("");
+            user.clear();
         }
     }
 
@@ -99,6 +99,7 @@ public class ExternalCompanyCRUDController extends GenericForwardComposer
         externalCompanyModel.initEdit(company);
         getVisibility().showOnly(createWindow);
         setInteractionFieldsActivation(company.getInteractsWithApplications());
+        clearAutocompleteUser();
         Util.reloadBindings(createWindow);
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
index 1adfbd0c6..89f424887 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
@@ -127,6 +127,7 @@
                                 <row visible = "@{controller.workReport.workReportType.resourceIsSharedInLines}">
                                         <label value="${i18n:_('Resource')}:" />
                                         <autocomplete id="autocompleteResource" buttonVisible="true"
+                                            value = "@{controller.workReport.resource}"
                                             onChange ="controller.changeResource(self.selectedItem);"
                                             finder="ResourceFinder"
                                             selectedItem="@{controller.workReport.resource}"/>