forgot password changes & bug fixing