Updated user handling.