Fix user handling.