Password reset allows username or email, added new lexicon to show that (fixes #811)