diff --git a/ChangeLog b/ChangeLog
index efe52cda0..237b69267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-08  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxAttendeesEditor.js
+	(performSearchCallback): set the uid parameter to null instead of
+	an empty string when the returned contact has no uid (ie, it comes
+	from a personal addressbook).
+
 2012-02-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/LDAPSource.m: escape built DNs using the new
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index bdf494de3..2753cc35b 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -219,7 +219,10 @@ function performSearchCallback(http) {
                     list.appendChild(node);
                     node.address = completeEmail;
                     // log("node.address: " + node.address);
-                    node.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
+                    if (contact["c_uid"])
+                        node.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
+                    else
+                        node.uid = null;
                     node.isList = isList;
                     if (isList) {
                         node.cname = contact["c_name"];
@@ -272,7 +275,10 @@ function performSearchCallback(http) {
                 if (data.contacts.length == 1) {
                     // Single result
                     var contact = data.contacts[0];
-                    input.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
+                    if (contact["c_uid"])
+                        input.uid = (contact["isMSExchange"]? UserLogin + ":" : "") + contact["c_uid"];
+                    else
+                        input.uid = null;
                     var isList = (contact["c_component"] &&
                                   contact["c_component"] == "vlist");
                     if (isList) {