Fix bad user handling