Changes to email callback
Merge