Issue #93: reordering enrollment fields