[Bug 33234] Improve user management