Improved current user management.