Password Recovery Stuff
Minor changes
Merge pull request #1 from csalajan/master

Password Recovery Stuff