adding forgot password functionality
fix merge issue