diff --git a/ChangeLog b/ChangeLog
index 0d5999dcf..314d22ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/SOGoAutoCompletion.js
+	(SOGoAutoCompletionInterface.onKeyDown): (needs review) we don't
+	overwrite the input's name attributes with the "uname". Otherwise
+	the form will not have the correct data when submitted and the
+	to/cc/bcc fields will be ignored.
+
 2009-09-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/PreferencesUI/UIxPreferences.m 
diff --git a/UI/WebServerResources/SOGoAutoCompletion.js b/UI/WebServerResources/SOGoAutoCompletion.js
index f3cfa6d96..06c5f69cb 100644
--- a/UI/WebServerResources/SOGoAutoCompletion.js
+++ b/UI/WebServerResources/SOGoAutoCompletion.js
@@ -72,7 +72,7 @@ var SOGoAutoCompletionInterface = {
                   var e = contacts[this.selectedIndex];
                   this.writeAttribute("card", e.readAttribute("card"));
                   this.writeAttribute("mail", e.readAttribute("mail"));
-                  this.writeAttribute("name", e.readAttribute("uname"));
+                  this.writeAttribute("uname", e.readAttribute("uname"));
                   this.writeAttribute("container", e.readAttribute("container"));
               }
           }
@@ -88,7 +88,7 @@ var SOGoAutoCompletionInterface = {
                   var e = contacts[this.selectedIndex];
                   this.writeAttribute("card", e.readAttribute("card"));
                   this.writeAttribute("mail", e.readAttribute("mail"));
-                  this.writeAttribute("name", e.readAttribute("uname"));
+                  this.writeAttribute("uname", e.readAttribute("uname"));
                   this.writeAttribute("container", e.readAttribute("container"));
               }
           }
@@ -215,7 +215,7 @@ var SOGoAutoCompletionInterface = {
                         else {
                             input.writeAttribute("card", contact['c_name']);
                             input.writeAttribute("mail", contact['c_mail']);
-                            input.writeAttribute("name", contact['c_cn']);
+                            input.writeAttribute("uname", contact['c_cn']);
                             var completeEmail = contact["c_cn"] + " <" + contact["c_mail"] + ">";
                             if (contact["c_cn"].substring(0, input.value.length).toUpperCase()
                                 == input.value.toUpperCase())
@@ -253,7 +253,7 @@ var SOGoAutoCompletionInterface = {
             }
             else {
                 this.writeAttribute("mail", e.readAttribute("mail"));
-                this.writeAttribute("name", e.readAttribute("uname"));
+                this.writeAttribute("uname", e.readAttribute("uname"));
             }
             this.writeAttribute("uid", e.readAttribute("uid"));
             this.value = e.readAttribute("address");
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index 9e5782b9a..9c41c17d0 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -93,6 +93,7 @@ function expandContactList (e) {
       + this.readAttribute("card") + "/properties";
     triggerAjaxRequest (url, expandContactListCallback, this);
 }
+
 function expandContactListCallback (http) {
     if (http.readyState == 4) {
         var input = http.callbackData;
@@ -118,7 +119,6 @@ function expandContactListCallback (http) {
     }
 }
 
-
 function addressFieldGotFocus(sender) {
     var idx;