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 c8961fbcf..f365a65fd 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_en.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_en.properties
@@ -15,7 +15,6 @@ statistics.number_users=Number of users: <span class="label label-info" id="user
 statistics.number_clients=Authorized clients: <span class="label label-info" id="clientCount">{0}</span>.
 statistics.number_approvals=Approved sites: <span class="label label-info" id="approvalCount">{0}</span>.</p>
 
-home.title=Home
 home.welcome=Welcome!
 home.welcome.body=\
 OpenID Connect is an internet-scale federated identity protocol built on top of the OAuth2 authorization framework. \
@@ -61,4 +60,5 @@ sidebar.developer.client_registration=Self-service client registration
 sidebar.developer.resource_registration=Self-service protected resource registration
 
 manage.ok=OK
-manage.loading=Loading
\ No newline at end of file
+manage.loading=Loading
+manage.title=Management Console
\ No newline at end of file
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 d7f70e92b..2e512f548 100644
--- a/openid-connect-server-webapp/src/main/resources/messages_sv.properties
+++ b/openid-connect-server-webapp/src/main/resources/messages_sv.properties
@@ -65,4 +65,5 @@ sidebar.developer.client_registration=Self-service klientregistering
 sidebar.developer.resource_registration=Self-service registrering av skyddad resurs
 
 manage.ok=OK
-manage.loading=Laddar
\ No newline at end of file
+manage.loading=Laddar
+manage.title=Administrationsgränssnitt
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp
index 99751cb77..41adfc8b5 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/about.jsp
@@ -1,11 +1,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
-<%@ taglib prefix="security"
-	uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
 <!-- TODO: highlight proper section of topbar; what is the right way to do this? -->
-
-<o:header title="About"/>
+<spring:message code="about.title" var="title"/>
+<o:header title="${title}"/>
 <o:topbar pageName="About"/>
 <div class="container-fluid main">
 	<div class="row-fluid">
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp
index 194ab4782..159f664c2 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/contact.jsp
@@ -1,11 +1,12 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
-<%@ taglib prefix="security"
-	uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
 <!-- TODO: highlight proper section of topbar; what is the right way to do this? -->
 
-<o:header title="Contact"/>
+<spring:message code="contact.title" var="title"/>
+<o:header title="${title}"/>
 <o:topbar pageName="Contact"/>
 <div class="container-fluid main">
 	<div class="row-fluid">
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
index 4153385eb..363051881 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
@@ -3,7 +3,8 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 
-<o:header title="welcome" />
+<spring:message code="home.welcome" var="title"/>
+<o:header title="${title}" />
 <o:topbar pageName="Home" />
 <div class="container-fluid main">
 	<div class="row-fluid">
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp
index d8cb15299..f01330266 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/manage.jsp
@@ -2,7 +2,8 @@
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
-<o:header title="Management Console"/>
+<spring:message code="manage.title" var="title"/>
+<o:header title="${title}"/>
 <o:topbar pageName="Home" />
 
 <!-- Modal dialogue for management UI -->
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp
index 6ca601190..69a3c6328 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/stats.jsp
@@ -1,11 +1,12 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
-<%@ taglib prefix="security"
-	uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 
 <!-- TODO: highlight proper section of topbar; what is the right way to do this? -->
 
-<o:header title="Statistics"/>
+<spring:message code="statistics.title" var="title"/>
+<o:header title="${title}"/>
 <o:topbar pageName="Statistics"/>
 <div class="container-fluid main">
     <div class="row-fluid">