More user list fixes