I checked out the usermanagement PR and the second option doesn't really seem to be the one to go with, there's various followups for the widgetization throughout PRs mixed with usermanagement stuff.