Guarantee order of form population and give preferential treatment to automatically re-populated forms, closes #1364