More link_account fixes