Fixes for user management