Change order of fields in the form.
Merge pull request #5949 from openscholar/5901

Change order of fields in the form.