make address-update form much smarter