user management and bundled bug fix