TurboTax EasyStep does not handle this situation very well which is why I didn't use it. Follow the steps in my note above and you won't get into any issues. By the way you are not changing the 1099-R. That is input exactly as it is sent. The Rollover is indicated on your Form-5498 which you should have also received from your investment company.
