Fix initial data on form population