Re-work username offset to avoid messing up later columns
Tidy up user file offset code