[IMP] account: implemented fixes made in 8.0