Userinfo fixes