Users shouldn't have site as mandatory (backport fix from trunk)