FC-2417 FC-2844 fix forgot password functionality