Merge pull request #27 from imohkay/master

please merge my changes
Funny error in password reset corrected
Merge pull request #28 from kabirkukreti/master

Funny error is password reset corrected
changes to the password templates