*8420* Fix clobbered email_log assoc_id on upgrade