We could consider it, at the moment I use the same approach we use for the user management. I think we can migrate both to the new stuff once #8507 is merged. But I would consider this a extra task.