MDL-42772 upgrade: Force alternate fields in session user