[3.8] Fix #1186 Reorder of admin fields