[master] Add user state