diff --git a/ChangeLog b/ChangeLog
index 8d09934da..b78109ce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-17  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* UI/WebServerResources/UIxListEditor.js (endEditable): 
+	We use "uname" instead of "name" when reading back the 
+	values from the autocompletion code.
+
 2009-10-16  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/SchedulerUI.js (eventsListCallback): don't
diff --git a/SoObjects/Contacts/SOGoContactGCSList.m b/SoObjects/Contacts/SOGoContactGCSList.m
index 89d3aee4d..1913232e1 100644
--- a/SoObjects/Contacts/SOGoContactGCSList.m
+++ b/SoObjects/Contacts/SOGoContactGCSList.m
@@ -1,6 +1,6 @@
 /* SOGoContactGCSList.m - this file is part of SOGo
  *
- * Copyright (C) 2008 Inverse inc.
+ * Copyright (C) 2008-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m
index 893a4710c..953d571a9 100644
--- a/UI/Contacts/UIxListEditor.m
+++ b/UI/Contacts/UIxListEditor.m
@@ -1,6 +1,6 @@
 /* UIxListEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2008 Inverse inc.
+ * Copyright (C) 2008-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/WebServerResources/UIxListEditor.js b/UI/WebServerResources/UIxListEditor.js
index 6aa9dc687..adf568660 100644
--- a/UI/WebServerResources/UIxListEditor.js
+++ b/UI/WebServerResources/UIxListEditor.js
@@ -33,22 +33,23 @@ function endEditable (event, element) {
     if (element) {
       card = element.readAttribut("card");
       mail = element.readAttribute("mail");
-      name = element.readAttribute("name");
+      name = element.readAttribute("uname");
     }
     else {
       if ($(this).tagName == "INPUT") {
           element = this.ancestors ().first ();
           card = this.readAttribute ("card");
-          name = this.readAttribute ("name");
+          name = this.readAttribute ("uname");
           mail = this.readAttribute ("mail");
       }
       else {
           element = this;
           card = element.childElements ().first ().readAttribute ("card");
           mail = element.childElements ().first ().readAttribute ("mail");
-          name = element.childElements ().first ().readAttribute ("name");
+          name = element.childElements ().first ().readAttribute ("uname");
       }
     }
+
     element.writeAttribute ("card", card);
     element.writeAttribute ("name", name);
     element.writeAttribute ("mail", mail);