Making the password reset work properly - fixed #67