Reworked related account form handling.