Safer passing of owner info (OMS-396)