KRACOEUS-6982: Fix ordering of fields on initial page