some fixes on forget password