Fixed forms, added UserType enum, and other stuff