improved handling of private accounts