Extend the userschema properly, and fix other things