Fixing mail layout.
Fixing twig file.
Merge pull request #451 from ngodfraind/reset-pwd

Reset pwd