I believe the citizenship issue has been fixed, and will be going out with GU41. There were a number of places where vendors/quests/etc were set to check for citizens of specific cities and were changed instead to isGood or isEvil, to prevent this same sort of thing from happening in the future
LINK