Fix #1186 Reorder of admin fields

Fix tests
Merge pull request #366 from nlegoff/fix_1186

[3.8] Fix #1186 Reorder of admin fields