Fix race condition when user creates default address