diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index 033c16b09..03204c8f8 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -254,7 +254,7 @@ var ClientView = Backbone.View.extend({
         this.$('.allow-introspection').tooltip({title: 'This client can perform token introspection'});
         
         this.updateMatched();
-        
+        $(this.el).i18n();
         return this;
     },
     
@@ -475,7 +475,7 @@ var ClientListView = Backbone.View.extend({
         $(this.el).html($('#tmpl-client-table').html());
         
         this.renderInner();
-
+        $(this.el).i18n();
         return this;        
     },
     
@@ -1099,7 +1099,8 @@ var ClientFormView = Backbone.View.extend({
         		+'Future versions of the server library will make use of this.'
         	});
         
-       return this;
+        $(this.el).i18n();
+        return this;
     }
 });
 
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 563bdabb0..963726f67 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
@@ -14,6 +14,12 @@
         }
     },
     "client": {
+        "client-table": {
+            "new": "New Client",
+            "no-clients": "There are no registered clients on this server.",
+            "no-matches": "There are no clients that match your search criteria.",
+            "search": "Search..."
+        },
         "more-info": {
             "contacts": "Administrative Contacts:",
             "home": "Home Page:",
@@ -32,6 +38,7 @@
         "description": "Description",
         "dynamically-registered": "This client was dynamically registered",
         "edit": "Edit",
+        "information": "Information",
         "revoke": "Revoke",
         "save": "Save",
         "scopes": "Scopes"
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 eee373242..dcd14ced0 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
@@ -14,6 +14,12 @@
         }
     },
     "client": {
+        "client-table": {
+            "new": "Ny klient",
+            "no-clients": "Det finns inga klienter registrerade.",
+            "no-matches": "Det finns inga klienter som matchar din sökning.",
+            "search": "Sök..."
+        },
         "more-info": {
             "contacts": "Administrativ kontakt:",
             "home": "Webbplats:",
@@ -32,6 +38,7 @@
         "description": "Beskrivning",
         "dynamically-registered": "Denna klient registrerades dynamiskt",
         "edit": "Ändra",
+        "information": "Information",
         "refresh": "Uppdatera",
         "revoke": "Återkalla",
         "save": "Spara",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
index 92ba108fe..c84a5c806 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
@@ -124,22 +124,22 @@
 
 <script type="text/html" id="tmpl-client-table">
     <div class="well well-small">
-		<button class="btn btn-small refresh-table"><i class="icon-refresh"></i> Refresh</button> &nbsp;
-        <button class="btn btn-small btn-primary new-client"><i class="icon-plus icon-white"></i> New Client</button>
+		<button class="btn btn-small refresh-table"><i class="icon-refresh"></i> <span data-i18n="common.refresh">Refresh</span></button> &nbsp;
+        <button class="btn btn-small btn-primary new-client"><i class="icon-plus icon-white"></i> <span data-i18n="client.client-table.new">New Client</span></button>
 		<div class="form-search pull-right">
 			<div class="input-append">
-				<input type="text" class="search-query" placeholder="Search...">
+				<input type="text" class="search-query" placeholder="Search..." data-i18n="[placeholder]client.client-table.search">
 				<button class="btn">&times;</button>
 			</div>
 		</div>
     </div>
 
 
-	<div id="client-table-search-empty" class="alert alert-warning">
+	<div id="client-table-search-empty" class="alert alert-warning" data-i18n="client.client-table.no-matches">
 		There are no clients that match your search criteria.
 	</div>
 
-	<div id="client-table-empty" class="alert alert-info">
+	<div id="client-table-empty" class="alert alert-info" data-i18n="client.client-table.no-clients">
 		There are no registered clients on this server.
 	</div>
 
@@ -149,8 +149,8 @@
         <thead>
         <tr>
 			<th></th>
-            <th>Client</th>
-            <th>Information</th>
+            <th data-i18n="common.client">Client</th>
+            <th data-i18n="common.information">Information</th>
             <th><i class="icon-edit"></i></th>
         </tr>
         </thead>
@@ -161,8 +161,8 @@
 	<div class="pagination paginator"></div>
 
     <div class="well well-small">
-		<button class="btn btn-small refresh-table"><i class="icon-refresh"></i> Refresh</button> &nbsp; 
-        <button class="btn btn-small btn-primary new-client"><i class="icon-plus icon-white"></i> New Client</button>
+        <button class="btn btn-small refresh-table"><i class="icon-refresh"></i> <span data-i18n="common.refresh">Refresh</span></button> &nbsp;
+        <button class="btn btn-small btn-primary new-client"><i class="icon-plus icon-white"></i> <span data-i18n="client.client-table.new">New Client</span></button>
     </div>
 </script>