Revert to f10908620fb3922b9b95cae4f54c0d6f9b3c8abd
User password reset mechanism