Fix up userinfo validation. Fixes #57