fixes on systemusers and emails apps