Add user and group, as needed