This improvement can be started once the new user preferences are set up, see https://github.com/xwiki/xwiki-platform/pull/2694