diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
index f0a93e7b..bd694581 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
@@ -151,6 +151,7 @@ public class ContactsSyncManager extends SyncManager {
         if (!url.equals(lastUrl)) {
             App.log.info("Selected address book has changed from " + lastUrl + " to " + url + ", deleting all local contacts");
             localAddressBook.deleteAll();
+            localAddressBook.setURL(remote.url);
         }
 
         // set up Contacts Provider Settings
@@ -372,7 +373,6 @@ public class ContactsSyncManager extends SyncManager {
     @Override
     protected void saveSyncState() throws CalendarStorageException, ContactsStorageException {
         super.saveSyncState();
-        ((LocalAddressBook)localCollection).setURL(remote.url);
     }
 
 
diff --git a/cert4android b/cert4android
index 3c55eb1f..704955ee 160000
--- a/cert4android
+++ b/cert4android
@@ -1 +1 @@
-Subproject commit 3c55eb1f6e066cd0e7b854388e46a7bb93374781
+Subproject commit 704955ee830d9254f1a3674888fb60dd56535715