Update locales to support real countries
Don't check for role