[Bug 33234] New: Improve user management