Refine user handling