diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java
index 23b1b439..4a0e40c7 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.java
@@ -113,7 +113,7 @@ public class CalendarSyncManager extends SyncManager {
             syncResult.stats.numUpdates++;
         } else {
             App.log.info("Adding " + newData.uid + " to local calendar");
-            localEvent = new LocalEvent(localCalendar(), newData, newData.uid, null);
+            localEvent = new LocalEvent(localCalendar(), newData, newData.uid, newData.uid);
             localEvent.add();
             syncResult.stats.numInserts++;
         }
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java
index 57febeeb..46f6e858 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java
@@ -193,13 +193,13 @@ public class ContactsSyncManager extends SyncManager {
         if (local == null) {
             if (newData.group) {
                 App.log.log(Level.INFO, "Creating local group", newData);
-                LocalGroup group = new LocalGroup(localAddressBook(), newData, uuid, null);
+                LocalGroup group = new LocalGroup(localAddressBook(), newData, uuid, uuid);
                 group.create();
 
                 local = group;
             } else {
                 App.log.log(Level.INFO, "Creating local contact", newData);
-                LocalContact contact = new LocalContact(localAddressBook(), newData, uuid, null);
+                LocalContact contact = new LocalContact(localAddressBook(), newData, uuid, uuid);
                 contact.create();
 
                 local = contact;