Update email message, Password warning
Merge pull request #1040 from achamely/master

Update email message, Password warning