Finishing Login mails
Merge branch 'master' into Gal
Finishing Login emails