update code for new user status
merge some changes I forgot to pull