Index: opensync/engine/opensync_obj_engine.c
===================================================================
--- opensync/engine/opensync_obj_engine.c       (revision 2233)
+++ opensync/engine/opensync_obj_engine.c       (working copy)
@@ -317,7 +317,7 @@
 
                /* We have to use the uid of the entry, so that the member
                 * can correctly identify the entry */
-               if (newChangeType == OSYNC_CHANGE_TYPE_ADDED)
+               if (newChangeType == OSYNC_CHANGE_TYPE_ADDED && existChangeType != OSYNC_CHANGE_TYPE_ADDED)
                        osync_change_set_uid(existChange, osync_change_get_uid(masterChange));
                else
                        osync_change_set_uid(existChange, osync_mapping_entry_get_uid(entry_engine->entry));