LUGG-139 : Re-arranging people fields