Forgot password some changes