Fixing mail functionality for first login
Pushing to git