diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
index 509840676..ca1134331 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
@@ -560,7 +560,7 @@ var AppRouter = Backbone.Router.extend({
         	
         	
         	$('#content').html(view.render().el);
-        	setPageTitle("New Client");
+        	setPageTitle($.t('client.client-form.new'));
         });
     },
 
@@ -611,7 +611,7 @@ var AppRouter = Backbone.Router.extend({
     		        var view = new ClientFormView({model:client, systemScopeList: app.systemScopeList});
     		        view.load(function() {
     		        	$('#content').html(view.render().el);
-    		        	setPageTitle("Edit Client");
+    		        	setPageTitle($.t('client.client-form.edit'));
     		        });
     		        
     			
@@ -725,7 +725,7 @@ var AppRouter = Backbone.Router.extend({
             if (client != null) {
             	this.whiteListFormView = new WhiteListFormView({model: whiteList, client: client, systemScopeList: this.systemScopeList});
             	$('#content').html(this.whiteListFormView.render().el);
-            	setPageTitle("Edit Whitelist");
+            	setPageTitle($.t('whitelist.edit'));
 
             } else {
             	console.log('ERROR: no client found for ' + whiteList.get('clientId'));
@@ -749,7 +749,7 @@ var AppRouter = Backbone.Router.extend({
     	view.load( 
     		function(collection, response, options) {
     			$('#content').html(view.render().el);
-    	    	setPageTitle("Manage Approved Sites");
+    	    	setPageTitle($.t('grant.manage-approved-sites'));
     		}
     	);
     	
@@ -769,7 +769,7 @@ var AppRouter = Backbone.Router.extend({
         view.load(
     		function(collection, response, options) {
 				$('#content').html(view.render().el);
-				setPageTitle("Manage Active Tokens");
+    	    	setPageTitle($.t('token.manage'));
     		}
         );
         
@@ -806,7 +806,7 @@ var AppRouter = Backbone.Router.extend({
         view.load(
         	function(collection, response, options) {
         		$('#content').html(view.render().el);
-            	setPageTitle("Manage Blacklist");
+            	setPageTitle($.t('admin.manage-blacklist'));
         	}
         );
     },
@@ -937,7 +937,7 @@ var AppRouter = Backbone.Router.extend({
     	
     		$('#content').html(view.render().el);
     		view.delegateEvents();
-    		setPageTitle("Dynamically Register a New Client");
+    		setPageTitle($.t('dynreg.new-client'));
     		
     	});
     	
@@ -953,7 +953,7 @@ var AppRouter = Backbone.Router.extend({
     	
         this.updateSidebar('dev/dynreg');
         
-    	setPageTitle("Edit a Dynamically Registered Client");
+    	setPageTitle($.t('dynreg.edit-existing'));
     	// note that this doesn't actually load the client, that's supposed to happen elsewhere...
     },
     
@@ -1004,7 +1004,7 @@ var AppRouter = Backbone.Router.extend({
     	
     		$('#content').html(view.render().el);
     		view.delegateEvents();
-    		setPageTitle("Dynamically Register a New Protected Resource");
+    		setPageTitle($.t('rsreg.new-resource'));
     		
     	});
     	
@@ -1020,7 +1020,7 @@ var AppRouter = Backbone.Router.extend({
     	
         this.updateSidebar('dev/resource');
         
-    	setPageTitle("Edit a Dynamically Registered Protected Resource");
+    	setPageTitle($.t('rsreg.edit-existing'));
     	// note that this doesn't actually load the client, that's supposed to happen elsewhere...
     },
     
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
index a972c871c..9702ef471 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
@@ -465,7 +465,7 @@ var DynRegEditView = Backbone.View.extend({
         });
 
         var scopeView = new ListWidgetView({
-        	placeholder: 'new scope', 
+        	placeholder: $.t('client.client-form.scope-placeholder'), 
         	autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))), 
             collection: this.scopeCollection});
         $("#scope .controls",this.el).html(scopeView.render().el);
@@ -500,7 +500,7 @@ var DynRegEditView = Backbone.View.extend({
         });
         
         var defaultAcrView = new ListWidgetView({
-        	placeholder: 'new ACR value',
+        	placeholder: $.t('client.client-form.acr-values-placeholder'),
         	// TODO: autocomplete from spec
         	collection: this.defaultAcrValuesCollection});
         $('#defaultAcrValues .controls', this.el).html(defaultAcrView.render().el);
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 bfb3b183e..d81be672d 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
@@ -7,6 +7,7 @@
         "list-widget": {
             "empty": "There are no items in this list."
         },
+        "manage-blacklist": "Manage Blacklist",
         "user-profile": {
             "claim": "Claim name:",
             "text": "Your user profile has the following information:",
@@ -118,6 +119,7 @@
                 "show-secret": "Show Secret",
                 "unchanged": "unchanged"
             },
+            "scope-placeholder": "nytt scope",
             "seconds": "seconds",
             "secret-asymmetric-jwt": "Asymmetrically-signed JWT assertion",
             "secret-http": "Client Secret over HTTP Basic",
@@ -212,7 +214,7 @@
         "will-be-generated": "Will be generated"
     },
     "grant": {
-        "more-info": "more information",
+        "manage-approved-sites": "Manage Approved Sites",
         "refresh": "Refresh",
         "grant-table": {
             "active-tokens": "Number of currently active access tokens",
@@ -275,6 +277,7 @@
         }
     },
     "token": {
+        "manage": "Administrera aktiva tokens",
         "token-table": {
             "access-tokens": "Access Tokens",
             "associated-id": "This access token was issued with an associated ID token.",
@@ -294,6 +297,7 @@
     },
     "whitelist": {
         "confirm": "Are you sure you want to delete this whitelist entry?",
+        "edit": "Edit Whitelist",
         "whitelist": "Whitelist",
         "whitelist-form": {
             "allowed-scopes": "Allowed 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 7ccc0b6ed..5c3a8f2e2 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
@@ -4,6 +4,7 @@
         "blacklist-form": {
             "blacklisted-uris": "Svarlistade länkar"
         },
+        "manage-blacklist": "Administrera svartlista",
         "list-widget": {
             "empty": "Det finns inget innehåll i denna lista."
         },
@@ -32,7 +33,7 @@
             "client-id-help": "Unik identifierare. Om du lämnar detta fält tomt kommer ett nytt ID genereras automatiskt",
             "client-id-placeholder": "Skriv någonting",
             "client-name": "Klientnamn",
-            "client-name-help": "Läsbar och begripligt namn på klienten",
+            "client-name-help": "Läsbart och begripligt namn på klienten",
             "client-name-placeholder": "Skriv någonting",
             "client-password": "lösenord",
             "client-secret": "Klienthemlighet",
@@ -65,7 +66,7 @@
             "generate-on-save": "Genereras vid sparande",
             "grant-types": "Grant-typer",
             "home": "Hemsida",
-            "home-help": "Länk till tjänstens hemsida. Den kommer att visas på bekräftelsesidan.",
+            "home-help": "Länk till tjänstens hemsida. Den visas på bekräftelsesidan.",
             "hours": "timmar",
             "id": "ID:",
             "id-token-crypto-algorithm": "Krypteringsalgoritm för ID-token",
@@ -79,7 +80,7 @@
             "jwk-set": "JWK Set",
             "jwk-set-help": "Länk till klientens JSON Webb-nyckel-set",
             "logo": "Logotyp",
-            "logo-help": "Länk till en logotyp. Den kommer att visas på bekräftelsesidan.",
+            "logo-help": "Länk till en logotyp. Den visas på bekräftelsesidan.",
             "main": "Basinformation",
             "max-age": "Max sessions-längd",
             "max-age-help": "Default maximal sessions-längd innan användaren tillfrågas igen",
@@ -118,6 +119,7 @@
                 "show-secret": "Visa hemlighet",
                 "unchanged": "oförändrad"
             },
+            "scope-placeholder": "new scope",
             "seconds": "sekunder",
             "secret-asymmetric-jwt": "Asymmetriskt signerad JWT assertion",
             "secret-http": "Klienthemlighet över HTTP Basic",
@@ -215,6 +217,7 @@
         "will-be-generated": "Kommer att genereras"
     },
     "grant": {
+        "manage-approved-sites": "Manage Approved Sites",
         "refresh": "Uppdatera",
         "grant-table": {
             "active-tokens": "Antal nu aktiva åtkomst-tokens",
@@ -234,14 +237,14 @@
     },
     "rsreg": {
         "resource-id-placeholder": "Mata in resurs-ID",
-        "configuration-url": "Konfigurationslänk för klienten",
+        "configuration-url": "Konfigurationslänk för resursen",
         "edit-existing": "Ändra en befintlig resurs",
         "edit-existing-help": "Klistra in ditt resurs-ID och registrerings-access-token för att komma åt resursens egenskaper.",
-        "invalid-access-token": "Ogiltig klient eller registration-access-token.",
-        "new-client": "Registrera en ny klient",
-        "or": " - ELLER - ",
-        "regtoken-placeholder": "Mata in registration-access-token",
-        "will-be-generated": "Kommer att genereras"
+        "invalid-access-token": "Ogiltig resurs eller registration-access-token.",
+        "new": "Registrera en ny resurs",
+        "edit": "Ändra en befintlig resurs",
+        "new-resource": "Registrera en ny resurs",
+        "regtoken-placeholder": "Mata in registration-access-token"
     },
     "scope": {
         "scope-list": {
@@ -273,6 +276,7 @@
         }
     },
     "token": {
+        "manage-tokens": "Manage Active Tokens",
         "token-table": {
             "access-tokens": "Access-token",
             "associated-id": "Denna access-token utfärdades med en tillhörande ID-token.",
@@ -291,6 +295,7 @@
     },
     "whitelist": {
         "confirm": "Är du säker på att du vill ta bort den här klienten ifrån vitlistan?",
+        "edit": "Redigera vitlista",
         "whitelist": "Vitlista",
         "whitelist-form": {
             "allowed-scopes": "Tillåtna scope",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
index 97112add6..8e275b772 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
@@ -70,7 +70,7 @@ var ResRegRootView = Backbone.View.extend({
     	}
 
     	$('#loadingbox').sheet('show');
-    	$('#loading').html('<span class="label" id="loading-scopes">Scopes</span> ');
+    	$('#loading').html('<span class="label" id="loading-scopes">' + $.t('common.scopes') + '</span> ');
 
     	$.when(this.options.systemScopeList.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
     	.done(function() {
@@ -110,7 +110,7 @@ var ResRegRootView = Backbone.View.extend({
 	    	view.load(function() {
 	    		$('#content').html(view.render().el);
 	    		view.delegateEvents();
-	    		setPageTitle("Dynamically Register a New Protected Resource");
+	    		setPageTitle($.t('rsreg.new'));
 	    		app.navigate('dev/resource/edit', {trigger: true});	    		
 	    		self.remove();
 	    	});
@@ -154,7 +154,7 @@ var ResRegEditView = Backbone.View.extend({
     	}
 
     	$('#loadingbox').sheet('show');
-    	$('#loading').html('<span class="label" id="loading-scopes">Scopes</span> ');
+    	$('#loading').html('<span class="label" id="loading-scopes">' + $.t('common.scopes') + '</span> ');
 
     	$.when(this.options.systemScopeList.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
     	.done(function() {
@@ -179,7 +179,7 @@ var ResRegEditView = Backbone.View.extend({
     deleteClient:function (e) {
     	e.preventDefault();
 
-        if (confirm("Are you sure sure you would like to delete this client?")) {
+        if (confirm($.t('client.client-table.confirm'))) {
             var self = this;
 
             this.model.destroy({
@@ -366,7 +366,7 @@ var ResRegEditView = Backbone.View.extend({
         });
 
         var scopeView = new ListWidgetView({
-        	placeholder: 'new scope', 
+        	placeholder: $.t('client.client-form.scope-placeholder'), 
         	autocomplete: _.uniq(_.flatten(this.options.systemScopeList.pluck("value"))), 
             collection: this.scopeCollection});
         $("#scope .controls",this.el).html(scopeView.render().el);
@@ -378,7 +378,7 @@ var ResRegEditView = Backbone.View.extend({
         });
         
         var contactView = new ListWidgetView({
-        	placeholder: 'new contact',
+        	placeholder: $.t('client.client-form.contacts-placeholder'),
         	collection: this.contactsCollection});
         $("#contacts .controls div", this.el).html(contactView.render().el);
         this.listWidgetViews.push(contactView);
@@ -402,7 +402,7 @@ var ResRegEditView = Backbone.View.extend({
         });
         
         var defaultAcrView = new ListWidgetView({
-        	placeholder: 'new ACR value',
+        	placeholder: $.t('client.client-form.acr-values-placeholder'),
         	// TODO: autocomplete from spec
         	collection: this.defaultAcrValuesCollection});
         $('#defaultAcrValues .controls', this.el).html(defaultAcrView.render().el);
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html b/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html
index 158aef91f..3b1c0714d 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html
@@ -24,7 +24,7 @@
 	<button class="btn btn-large" id="newreg" data-i18n="rsreg.new-resource">Register a new protected resource</button>
 </div>
 <div class="span2 text-center">
-	<strong><span data-i18n="rsreg.or"> - OR - </span></strong>
+	<strong><span data-i18n="dynreg.or"> - OR - </span></strong>
 </div>
 <div class="span5 well">
 	<input type="text" id="clientId" placeholder="Enter Resource ID" data-i18n="[placeholder]rsreg.resource-id-placeholder"> 
@@ -78,9 +78,13 @@
 			</div>
 
             <div class="control-group" id="clientId">
-                <label class="control-label">Client ID</label>
+                <label class="control-label" data-i18n="client.client-form.client-id">Client ID</label>
                 <div class="controls">
-                    <pre><%-client.client_id ? client.client_id : '<code>Will be generated</code>'%></pre>
+                <% if (client.client_id) { %>
+                    <pre><%-client.client_id%></pre>
+                <% } else { %>
+                    <code data-i18n="dynreg.will-be-generated">Will be generated</code>
+                <% } %>
                 </div>
             </div>
 
@@ -102,7 +106,7 @@
 								<% } %>
 							<% } %>
 						<% } else { %>
-							<pre>Will be generated</pre>
+                            <code data-i18n="dynreg.will-be-generated">Will be generated</code>
 						<% } %>
 	                </div>
     	        </div>
@@ -110,50 +114,24 @@
 			</div>
 
             <div class="control-group" id="clientConfigurationUri">
-                <label class="control-label">Client Configuration URL</label>
+                <label class="control-label" data-i18n="dynreg.configuration-url">Client Configuration URL</label>
                 <div class="controls">
-                    <pre><%-client.registration_client_uri ? client.registration_client_uri : 'Will be generated'%></pre>
+                <% if (client.registration_client_uri) { %>
+                    <pre><%-client.registration_client_uri%></pre>
+                <% } else { %>
+                    <code data-i18n="dynreg.will-be-generated">Will be generated</code>
+                <% } %>
                 </div>
             </div>
 
             <div class="control-group" id="registrationAccessToken">
-                <label class="control-label">Registration Access Token</label>
+                <label class="control-label" data-i18n="client.client-form.registration-access-token">Registration Access Token</label>
                 <div class="controls">
-                    <pre><%-client.registration_access_token ? client.registration_access_token : 'Will be generated'%></pre>
-                </div>
-            </div>
-
-			<% } else { %>
-
-            <div class="control-group" id="clientId">
-                <label class="control-label">ID</label>
-                <div class="controls">
-                    <code>Will be generated</code>
-                </div>
-            </div>
-
-
-			<div class="control-group" id="requireClientSecret">
-				<label class="control-label">Secret</label>
-    	        <div class="control-group">
-            	    <div class="controls">
-						<code>Will be generated</code>
-	                </div>
-    	        </div>
-
-			</div>
-
-            <div class="control-group" id="clientConfigurationUri">
-                <label class="control-label">Configuration URL</label>
-                <div class="controls">
-                    <code>Will be generated</code>
-                </div>
-            </div>
-
-            <div class="control-group" id="registrationAccessToken">
-                <label class="control-label">Registration Access Token</label>
-                <div class="controls">
-                    <code>Will be generated</code>
+                <% if (client.registration_access_token) { %>
+                    <pre><%-client.registration_access_token%></pre>
+                <% } else { %>
+                    <code data-i18n="dynreg.will-be-generated">Will be generated</code>
+                <% } %>
                 </div>
             </div>
 
@@ -161,19 +139,19 @@
 
 
             <div class="control-group" id="clientName">
-                <label class="control-label">Resource name</label>
+                <label class="control-label" data-i18n="client.client-form.client-name">Client name</label>
                 <div class="controls">
                     <input value="<%-client.client_name ? client.client_name : ''%>" maxlength="100" type="text" class="" placeholder="Type something">
-                    <p class="help-block">Human-readable application name</p>
+                    <p class="help-block" data-i18n="client.client-form.client-name-help">Human-readable application name</p>
                 </div>
             </div>
 
 			<div class="control-group" id="logoUri">
-				<label class="control-label">Logo</label>
-				<div class="controls">
-					<input placeholder="https://" value="<%-client.logo_uri ? client.logo_uri : ''%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL that points to a logo image, will be displayed on approval page</p>
-				</div>
+                <label class="control-label" data-i18n="client.client-form.logo">Logo</label>
+                <div class="controls">
+                    <input placeholder="https://" value="<%-client.logo_uri ? client.logo_uri : ''%>" maxlength="1000" type="text" class=""/>
+                    <p class="help-block" data-i18n="client.client-form.logo-help">URL that points to a logo image, will be displayed on approval page</p>
+                </div>
 			</div>
 
 			<div class="control-group" id="logoBlock">
@@ -183,46 +161,46 @@
 			</div>
 
 			<div class="control-group" id="tosUri">
-				<label class="control-label">Terms of Service</label>
-				<div class="controls">
-					<input placeholder="https://" value="<%-client.tos_uri ? client.tos_uri : ''%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL for the Terms of Service of this client, will be displayed to the user</p>
-				</div>
+                <label class="control-label" data-i18n="client.client-form.terms">Terms of Service</label>
+                <div class="controls">
+                    <input placeholder="https://" value="<%-client.tos_uri ? client.tos_uri : ''%>" maxlength="1000" type="text" class=""/>
+                    <p class="help-block" data-i18n="client.client-form.terms-help">URL for the Terms of Service of this client, will be displayed to the user</p>
+                </div>
 			</div>
 
 			<div class="control-group" id="policyUri">
-				<label class="control-label">Policy</label>
-				<div class="controls">
-					<input placeholder="https://" value="<%-client.policy_uri ? client.policy_uri : ''%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL for the Policy Statement of this client, will be displayed to the user</p>
-				</div>
+                <label class="control-label" data-i18n="client.client-form.policy">Policy</label>
+                <div class="controls">
+                    <input placeholder="https://" value="<%-client.policy_uri ? client.policy_uri : ''%>" maxlength="1000" type="text" class=""/>
+                    <p class="help-block" data-i18n="client.client-form.policy-help">URL for the Policy Statement of this client, will be displayed to the user</p>
+                </div>
 			</div>
 
 			<div class="control-group" id="clientUri">
-				<label class="control-label">Home Page</label>
-				<div class="controls">
-					<input placeholder="https://" value="<%-client.client_uri ? client.client_uri : ''%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL for the client's home page, will be displayed to the user</p>
-				</div>
+                <label class="control-label" data-i18n="client.client-form.home">Home Page</label>
+                <div class="controls">
+                    <input placeholder="https://" value="<%-client.client_uri ? client.client_uri : ''%>" maxlength="1000" type="text" class=""/>
+                    <p class="help-block" data-i18n="client.client-form.home-help">URL for the client's home page, will be displayed to the user</p>
+                </div>
 			</div>
 
 			<div class="control-group" id="applicationType">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Application Type</label>
-				<div class="controls">
-					<label class="radio inline">
-						<input type="radio" name="applicationType" value="NATIVE" <%-(client.application_type == 'NATIVE' ? 'checked' : '')%>> Native
-					</label>
-					<label class="radio inline">
-						<input type="radio" name="applicationType" value="WEB" <%-(client.application_type == 'WEB' ? 'checked' : '')%>> Web
-					</label>
-				</div>
+                <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> <span data-i18n="client.client-form.type">Application Type</span></label>
+                <div class="controls">
+                    <label class="radio inline">
+                        <input type="radio" name="applicationType" value="NATIVE" <%-(client.application_type == 'NATIVE' ? 'checked' : '')%>> <span data-i18n="client.client-form.type-native">Native</span>
+                    </label>
+                    <label class="radio inline">
+                        <input type="radio" name="applicationType" value="WEB" <%-(client.application_type == 'WEB' ? 'checked' : '')%>> <span data-i18n="client.client-form.type-web">Web</span>
+                    </label>
+                </div>
 			</div>
 			
             <div class="control-group" id="contacts">
-                <label class="control-label">Contacts</label>
+                <label class="control-label" data-i18n="client.client-form.contacts">Contacts</label>
                 <div class="controls">
-					<span class="help-block">List of contacts for adminstrators of this client. Your email address (<%- userInfo.email %>) will be automatically added to this list on save.</span>
-					<div></div>
+                    <p class="help-block" data-i18n="client.client-form.contacts-help">List of contacts for adminstrators of this client.</p>
+                    <div></div>
                 </div>
             </div>
 
@@ -231,7 +209,7 @@
 	<div class="tab-pane" id="resource-access-tab">
 
             <div class="control-group" id="scope">
-                <label class="control-label">Scope</label>
+                <label class="control-label" data-i18n="common.scope">Scope</label>
                 <div class="controls">
                 </div>
             </div>
@@ -240,50 +218,55 @@
 	<div class="tab-pane" id="resource-secret-tab">
 
 			<div class="control-group" id="tokenEndpointAuthMethod">
-				<label class="control-label">Introspection Endpoint Authentication Method</label>
-				<div class="controls">
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="client_secret_basic" <%-(client.token_endpoint_auth_method == 'client_secret_basic' ? 'checked' : '')%>> Client Secret over HTTP Basic
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="client_secret_post" <%-(client.token_endpoint_auth_method == 'client_secret_post' ? 'checked' : '')%>> Client Secret over HTTP POST
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="client_secret_jwt" <%-(client.token_endpoint_auth_method == 'client_secret_jwt' ? 'checked' : '')%>> Client Secret via symmetrically-signed JWT assertion
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="private_key_jwt" <%-(client.token_endpoint_auth_method == 'private_key_jwt' ? 'checked' : '')%>> Asymmetrically-signed JWT assertion
-					</label>
-					<label class="radio">
-						<input type="radio" name="tokenEndpointAuthMethod" value="none" <%-(client.token_endpoint_auth_method == 'none' ? 'checked' : '')%>> No authentication
-					</label>
-				</div>
+                <label class="control-label" data-i18n="client.client-form.authentication-method">Token Endpoint Authentication Method</label>
+                <div class="controls">
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodBasic" name="tokenEndpointAuthMethod" value="client_secret_basic" <%-(client.token_endpoint_auth_method == 'client_secret_basic' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodBasic" class="radio" data-i18n="client.client-form.secret-http">Client Secret over HTTP Basic</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodPost" name="tokenEndpointAuthMethod" value="client_secret_post" <%-(client.token_endpoint_auth_method == 'client_secret_post' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodPost" class="radio" data-i18n="client.client-form.secret-post">Client Secret over HTTP POST</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodSymm" name="tokenEndpointAuthMethod" value="client_secret_jwt" <%-(client.token_endpoint_auth_method == 'client_secret_jwt' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodSymm" class="radio" data-i18n="client.client-form.secret-symmetric-jwt">Client Secret via symmetrically-signed JWT assertion</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodAssym" name="tokenEndpointAuthMethod" value="private_key_jwt" <%-(client.token_endpoint_auth_method == 'private_key_jwt' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodAssym" class="radio" data-i18n="client.client-form.secret-asymmetric-jwt">Asymmetrically-signed JWT assertion</label>
+                    </div>
+                    <div>
+                        <input type="radio" id="tokenEndpointAuthMethodNone" name="tokenEndpointAuthMethod" value="none" <%-(client.token_endpoint_auth_method == 'none' ? 'checked' : '')%>>
+                        <label for="tokenEndpointAuthMethodNone" class="radio" data-i18n="client.client-form.secret-none">No authentication</label>
+                    </div>
+                </div>
 			</div>
 
             <div class="control-group" id="tokenEndpointAuthSigningAlg">
-                <label class="control-label">Introspection Endpoint Authentication Signing Algorithm</label>
+                <label class="control-label" data-i18n="client.client-form.token-signing-algorithm">Token Endpoint Authentication Signing Algorithm</label>
                 <div class="controls">
-					<select>
-						<option value="default" <%-client.token_endpoint_auth_signing_alg == null ? 'selected ' : ''%>>Any allowed</option>
-						<option value="HS256" <%-client.token_endpoint_auth_signing_alg == "HS256" ? 'selected' : ''%>>HMAC using SHA-256 hash algorithm</option>
-						<option value="HS384" <%-client.token_endpoint_auth_signing_alg == "HS384" ? 'selected' : ''%>>HMAC using SHA-384 hash algorithm</option>
-						<option value="HS512" <%-client.token_endpoint_auth_signing_alg == "HS512" ? 'selected' : ''%>>HMAC using SHA-512 hash algorithm</option>
-						<option value="RS256" <%-client.token_endpoint_auth_signing_alg == "RS256" ? 'selected' : ''%>>RSASSA using SHA-256 hash algorithm</option>
-						<option value="RS384" <%-client.token_endpoint_auth_signing_alg == "RS384" ? 'selected' : ''%>>RSASSA using SHA-384 hash algorithm</option>
-						<option value="RS512" <%-client.token_endpoint_auth_signing_alg == "RS512" ? 'selected' : ''%>>RSASSA using SHA-512 hash algorithm</option>
-						<option value="ES256" <%-client.token_endpoint_auth_signing_alg == "ES256" ? 'selected' : ''%>>ECDSA using P-256 curve and SHA-256 hash algorithm</option>
-						<option value="ES384" <%-client.token_endpoint_auth_signing_alg == "ES384" ? 'selected' : ''%>>ECDSA using P-384 curve and SHA-384 hash algorithm</option>
-						<option value="ES512" <%-client.token_endpoint_auth_signing_alg == "ES512" ? 'selected' : ''%>>ECDSA using P-512 curve and SHA-512 hash algorithm</option>
-					</select>
+                    <select>
+                        <option value="default" <%-client.token_endpoint_auth_signing_alg == null ? 'selected ' : ''%> data-i18n="client.client-form.signing.any">Any allowed</option>
+                        <option value="HS256" <%-client.token_endpoint_auth_signing_alg == "HS256" ? 'selected' : ''%> data-i18n="client.client-form.signing.hmac-256">HMAC using SHA-256 hash algorithm</option>
+                        <option value="HS384" <%-client.token_endpoint_auth_signing_alg == "HS384" ? 'selected' : ''%> data-i18n="client.client-form.signing.hmac-384">HMAC using SHA-384 hash algorithm</option>
+                        <option value="HS512" <%-client.token_endpoint_auth_signing_alg == "HS512" ? 'selected' : ''%> data-i18n="client.client-form.signing.hmac-512">HMAC using SHA-512 hash algorithm</option>
+                        <option value="RS256" <%-client.token_endpoint_auth_signing_alg == "RS256" ? 'selected' : ''%> data-i18n="client.client-form.signing.rsassa-256">RSASSA using SHA-256 hash algorithm</option>
+                        <option value="RS384" <%-client.token_endpoint_auth_signing_alg == "RS384" ? 'selected' : ''%> data-i18n="client.client-form.signing.rsassa-384">RSASSA using SHA-384 hash algorithm</option>
+                        <option value="RS512" <%-client.token_endpoint_auth_signing_alg == "RS512" ? 'selected' : ''%> data-i18n="client.client-form.signing.rsassa-512">RSASSA using SHA-512 hash algorithm</option>
+                        <option value="ES256" <%-client.token_endpoint_auth_signing_alg == "ES256" ? 'selected' : ''%> data-i18n="client.client-form.signing.ecdsa-256">ECDSA using P-256 curve and SHA-256 hash algorithm</option>
+                        <option value="ES384" <%-client.token_endpoint_auth_signing_alg == "ES384" ? 'selected' : ''%> data-i18n="client.client-form.signing.ecdsa-384">ECDSA using P-384 curve and SHA-384 hash algorithm</option>
+                        <option value="ES512" <%-client.token_endpoint_auth_signing_alg == "ES512" ? 'selected' : ''%> data-i18n="client.client-form.signing.ecdsa-512">ECDSA using P-512 curve and SHA-512 hash algorithm</option>
+                    </select>
                 </div>
             </div>
 
 			<div class="control-group" id="jwksUri">
-				<label class="control-label">JWK Set</label>
-				<div class="controls">
-					<input placeholder="https://" value="<%-client.jwks_uri ? client.jwks_uri : ''%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL for the client's JSON Web Key set</p>
-				</div>
+                <label class="control-label" data-i18n="client.client-form.jwk-set">JWK Set</label>
+                <div class="controls">
+                    <input placeholder="https://" value="<%-client.jwks_uri ? client.jwks_uri : ''%>" maxlength="1000" type="text" class=""/>
+                    <p class="help-block" data-i18n="client.client-form.jwk-set-help">URL for the client's JSON Web Key set</p>
+                </div>
 			</div>
 
 	</div>