fixed #23674 fixed way of populing initial data

if form didn't pass validation we don't use that
data for popolating initial instead of we use original
initial data.