Backport Vi Localisation fix & Admin User Site