Fix correct group and user names