UserBean and fixes