Refactoring so that the 'common' recipe doesn't need to create the service user