removed usertype from user and fixed user params