Fixes for user email export