[#67166350] Fix address fields not being persisted between requests.