Rework of user management