Fix user handling