Fix insertion of additional metadata for IdPs