diff --git a/openid-connect-server-webapp/src/main/resources/messages_en.properties b/openid-connect-server-webapp/src/main/resources/messages_en.properties
index 7c924c1b4..16f904816 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_en.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_en.properties
@@ -3,18 +3,20 @@ common.login=Log in
 common.logout=Log out
 
 about.title=About
-about.body=<p>\
+about.body=\
 This OpenID Connect service is built from the MITREid Connect Open Source project, from \
 <a href="http://www.mitre.org/">The MITRE Corporation</a> and the <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.\
 </p>\
 <p>\
 More information about the project can be found at \
 <a href="http://github.com/mitreid-connect/">MITREid Connect on GitHub</a>. \
-There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.\
-</p>
+There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.
 
 statistics.title=Statistics
 
 home.title=Home
 
 contact.title=Contact
+contact.body=To report bugs with the MITREid Connect software itself, use the \
+<a href="https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues">GitHub issue tracker</a>. \
+For problems relating to this server, contact the server's administrator.
diff --git a/openid-connect-server-webapp/src/main/resources/messages_sv.properties b/openid-connect-server-webapp/src/main/resources/messages_sv.properties
index fd1cba801..db6a5b94d 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_sv.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_sv.properties
@@ -4,18 +4,21 @@ common.login=Logga in
 common.logout=Logga ut
 
 about.title=Om&nbsp;Tjänsten
-about.body=<p>\
+about.body=\
 Denna OpenID Connect är baserad på öppen källkod ifrån projektet MITREid, skapat av \
 <a href="http://www.mitre.org/">The MITRE Corporation</a> och <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.\
 </p>\
 <p>\
 Mer information om projektet kan finns i projektet \
 <a href="http://github.com/mitreid-connect/">MITREid Connect på GitHub</a>. \
-Där kan du skicka in felrapporter, komma med återkoppling, eller till och med bidra med kodtillägg för ytterligare funktioner du skulle vilja ha.\
-</p>
+Där kan du skicka in felrapporter, komma med återkoppling, eller till och med bidra med kodtillägg för ytterligare funktioner du skulle vilja ha.
 
 statistics.title=Statistik
 
 home.title=Hem
 
 contact.title=Kontakt
+contact.body=\
+För att rapportera fel i själva programvaran MITREid Connect, använd \
+<a href="https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues">GitHub issue tracker</a>. \
+För problem som är specifika för denna server, kontakta tjänstens administrator.
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
index 774e3172f..da7f1f66d 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag
@@ -1,3 +1,5 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <h2><spring:message code="about.title" text="About"/></h2>
+<p>
 <spring:message code="about.body" text="About body"/>
+</p>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
index efb538ff9..8518291d7 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/contactContent.tag
@@ -1,5 +1,5 @@
-<h2>Contact</h2>    
-<p>    
-To report bugs with the MITREid Connect software itself, use the <a href="https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/issues">GitHub issue tracker</a>.
-For problems relating to this server, contact the server's administrator.
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<h2><spring:message code="contact.title" text="Contact"/></h2>
+<p>
+<spring:message code="contact.body" text="Contact body"/>
 </p>