More users state fixes.