Export users fix