Simplify schema for #87, handle authented users.