Merge pull request #2 from ledgersmb/1.4

sync over 1.4 branch
Fix password reset issue.
(grafted from 6cc275f0dda52cba02825cc72690ad617fc06d37)

--HG--
extra : source : 6cc275f0dda52cba02825cc72690ad617fc06d37
Merge pull request #10 from ehuelsmann/1.4

Fix password reset issue.