Delete account fixes