Bumping this because I found a new issue with this:
If your preferred category is empty, it correctly defaults to the other one, however that changes your preference to the one you hadn’t selected, and must be manually changed back once your preference is available again.