Updated registration to add guest in a better way