Email notification implementation for new user (1451)

Fixed code conflicts and email notification implementation for new user signup. (1451)