big commit of user account related stuff