Fixed additional instances of hard coded user and group names