WL-3163 Fix usernames and CSV export