diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml
index bbea2fedc..491cbca56 100644
--- a/openid-connect-server-webapp/pom.xml
+++ b/openid-connect-server-webapp/pom.xml
@@ -52,6 +52,7 @@
 						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
 						<nonFilteredFileExtension>svg</nonFilteredFileExtension>
 						<nonFilteredFileExtension>jwks</nonFilteredFileExtension>
+						<nonFilteredFileExtension>json</nonFilteredFileExtension>
 					</nonFilteredFileExtensions>
 					<webResources>
 						<resource>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
index 80d5addf5..33f840409 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/en/messages.json
@@ -342,6 +342,7 @@
     	"dynamically-registered-unknown": "at an unknown time"
     },
     "home": {
+    	"title": "Home",
     	"welcome": {
     		"title": "Welcome!",
 			"body": "\nOpenID Connect is an internet-scale federated identity protocol built on top of the OAuth2 authorization framework. \nOpenID Connect lets you log into a remote site using your identity without exposing your credentials, like a username and password.</p>\n<p><a class=\"btn btn-primary btn-large\" href=\"http://openid.net/connect/\">Learn more &raquo;</a>"
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
index 3be641254..e2bdeec7c 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/locale/sv/messages.json
@@ -322,5 +322,28 @@
         "whitelist-table": {
             "no-sites": "Det finns inga vitlistade webbplatser. Använd knappen <strong>vitlista</strong> på klientadminstrationssidan för att skapa en."
         }
+    },
+    "home": {
+		"title": "Hem",
+		"welcome": {
+			"title": "Välkommen!",
+			"body": "\nOpenID Connect är ett internet-kapabelt federerat identitetsprotokoll byggt ovanpå autentiseringsramverket OAuth2. \nOpenID Connect låter dig logga in på en webbplats med din identitet utan att avslöja dina inloggningshemligheter, som ett användarnamn och lösenord.</p>\n<p><a class=\"btn btn-primary btn-large\" href=\"http://openid.net/connect/\">Lär dig mer &raquo;</a>"
+		},
+		"more": "Mer",
+		"about": {
+			"title": "Om&nbsp;tjänsten",
+			"body": "\nDenna OpenID Connect-tjänst är byggd från det öpnna källkodsprojektet MITREid, av \n<a href=\"http://www.mitre.org/\">MITRE Corporation</a> och <a href=\"http://kit.mit.edu/\">MIT Kerberos and Internet Trust Consortium</a>."
+		},
+		"contact": {
+			"title": "Kontakt",
+			"body": "\nFör mer information eller användarstöd, kontakta administratörerna av detta system.</p>\n<p><a class=\"btn\" href=\"mailto:idp@example.com?Subject=OpenID Connect\">E-post &raquo;</a>"
+		},
+		"statistics": {
+			"title": "Nuvarande statistik",
+			"loading": "Laddar...",
+			"number_users": "Antal användare: <span class=\"label label-info\" id=\"userCount\">{0}</span>",
+			"number_clients": "Auktoriserade klienter: <span class=\"label label-info\" id=\"clientCount\">{0}</span>",
+			"number_approvals": "Godkända webbplatser: <span class=\"label label-info\" id=\"approvalCount\">{0}</span>"
+		}
     }
 }
\ No newline at end of file
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java
index 6194a433f..25ba928a1 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java
@@ -18,8 +18,6 @@
 package org.mitre.openid.connect.config;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.text.MessageFormat;
@@ -121,7 +119,7 @@ public class JsonMessageSource extends AbstractMessageSource {
 				logger.info("No locale loaded, trying to load from " + r);
 				
 				JsonParser parser = new JsonParser();
-				JsonObject obj = (JsonObject) parser.parse(new InputStreamReader(r.getInputStream()));
+				JsonObject obj = (JsonObject) parser.parse(new InputStreamReader(r.getInputStream(), "UTF-8"));
 				
 				languageMaps.put(locale, obj);
 			} catch (JsonIOException | JsonSyntaxException | IOException e) {