Fixed issues with user and group maintenance