diff --git a/webapp/languages/example/i18n/all_es.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties
similarity index 100%
rename from webapp/languages/example/i18n/all_es.properties
rename to webapp/languages/es_GO/i18n/all_es_GO.properties
diff --git a/webapp/languages/example/templates/freemarker/search-help_es.ftl b/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/search-help_es.ftl
rename to webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/termsOfUse_es.ftl b/webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/termsOfUse_es.ftl
rename to webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-acctCreatedEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
similarity index 100%
rename from webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl
rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
index c89819421..081019a04 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
@@ -134,7 +134,8 @@ public class LocaleSelectionSetup implements ServletContextListener {
 			throws IllegalArgumentException {
 		Locale locale = LocaleUtils.toLocale(localeString);
 
-		if (!LocaleUtils.isAvailableLocale(locale)) {
+		if (!"es_GO".equals(localeString) && // No complaint about bogus locale
+				!LocaleUtils.isAvailableLocale(locale)) {
 			ssWarning("'" + locale + "' is not a recognized locale.");
 		}
 		return locale;