Fixed restricting accounts in some situations