Fixed bug in Forgot password
Conflict resolved