Fix password reset issue.
(grafted from 6cc275f0dda52cba02825cc72690ad617fc06d37)

--HG--
extra : source : 6cc275f0dda52cba02825cc72690ad617fc06d37