Optimize user csv export
Merge pull request #3039 from techAPJ/patch-1

Optimize user csv export