Updated client-side user holder to avoid