picking only required fields to reduce data size
sorry see you go (few changes to prev commit as well)
fixed regression issue
corrected
added username for new welcome email