Fixed and improved User user/group mappers and models. refs #116