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 2fe47c4c3..8ee649c28 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
@@ -30,6 +30,7 @@
             "client-name-help": "Human-readable application name",
             "client-name-placeholder": "Type something",
             "client-secret": "Client Secret",
+            "client-secret-placeholder": "Type a secret",
             "contacts": "Kontakter",
             "contacts-placeholder": "new contact",
             "credentials": "Credentials",
@@ -38,11 +39,14 @@
             "edit": "Edit Client",
             "generate-new-secret": "Generate a new client secret?",
             "generate-new-secret-help": "New secret will be generated when you click 'Save'",
+            "generate-on-save": "Generate on Save",
             "grant-types": "Grant Types",
             "home": "Home Page",
             "home-help": "URL for the client's home page, will be displayed to the user",
             "implicit": "implicit",
             "introspection": "Introspection",
+            "jwk-set": "JWK Set",
+            "jwk-set-help": "URL for the client's JSON Web Key set",
             "logo": "Logo",
             "logo-help": "URL that points to a logo image, will be displayed on approval page",
             "main": "Main",
@@ -67,6 +71,17 @@
             "subject-type": "Subject Type",
             "terms": "Terms of Service",
             "terms-help": "URL for the Terms of Service of this client, will be displayed to the user",
+            "token-signing-algorithm": "Token Endpoint Authentication Signing Algorithm",
+            "token-signing-any": "Any allowed",
+            "token-signing-ecdsa-256": "ECDSA using P-256 curve and SHA-256 hash algorithm",
+            "token-signing-ecdsa-384": "ECDSA using P-384 curve and SHA-384 hash algorithm",
+            "token-signing-ecdsa-512": "ECDSA using P-512 curve and SHA-512 hash algorithm",
+            "token-signing-hmac-256": "HMAC using SHA-256 hash algorithm",
+            "token-signing-hmac-384": "HMAC using SHA-384 hash algorithm",
+            "token-signing-hmac-512": "HMAC using SHA-512 hash algorithm",
+            "token-signing-rsassa-256": "RSASSA using SHA-256 hash algorithm",
+            "token-signing-rsassa-384": "RSASSA using SHA-384 hash algorithm",
+            "token-signing-rsassa-512": "RSASSA using SHA-512 hash algorithm",
             "tokens": "Tokens",
             "type": "Application Type",
             "type-native": "Native",
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 024604cbd..bafc0aefe 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
@@ -31,19 +31,23 @@
             "client-name-placeholder": "Skriv någonting",
             "client-password": "lösenord",
             "client-secret": "Client Secret",
+            "client-secret-placeholder": "Mata in en hemlighet",
             "contacts": "Kontakter",
             "contacts-placeholder": "ny kontakt",
             "credentials": "Hemligheter",
             "crypto": "Krypto",
-            "display-secret": "Display/edit client secret:",
+            "display-secret": "Visa/editera klientens hemlighet:",
             "edit": "Ändra klient",
             "generate-new-secret": "Generera en ny klienthemlighet?",
             "generate-new-secret-help": "En ny hemlighet kommer att genereras när du klickar på 'Save'",
+            "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.",
             "implicit": "implicit",
             "introspection": "Introspektion",
+            "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.",
             "main": "Basinformation",
@@ -67,6 +71,17 @@
             "subject-type": "Subjekttyp",
             "terms": "Villkor för tjänsten",
             "terms-help": "Länk till en sida som beskriver villkor för tjänsten. Den visas på bekräftelsesidan.",
+            "token-signing-algorithm": "Signeringsalgoritm för vald autentiseringsmetod",
+            "token-signing-any": "Valfri tillåten",
+            "token-signing-ecdsa-256": "ECDSA med P-256 kurva och SHA-256 hash-algoritm",
+            "token-signing-ecdsa-384": "ECDSA med P-384 kurva och SHA-384 hash-algoritm",
+            "token-signing-ecdsa-512": "ECDSA med P-512 kurva och SHA-512 hash-algoritm",
+            "token-signing-hmac-256": "HMAC med SHA-256 hash-algoritm",
+            "token-signing-hmac-384": "HMAC med SHA-384 hash-algoritm",
+            "token-signing-hmac-512": "HMAC med SHA-512 hash-algoritm",
+            "token-signing-rsassa-256": "RSASSA med SHA-256 hash-algoritm",
+            "token-signing-rsassa-384": "RSASSA med SHA-384 hash-algoritm",
+            "token-signing-rsassa-512": "RSASSA med SHA-512 hash-algoritm",
             "tokens": "Nycklar",
             "type": "Typ av tjänst",
             "type-native": "App",
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 a70b9d673..2015c17a3 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
@@ -457,10 +457,10 @@
     	        <div class="control-group">
             	    <div class="controls">
 						<div id="clientSecret" class="span3">
-                	    	<input value="<%-clientSecret%>" maxlength="100" type="text" placeholder="Type a secret">
+                	    	<input value="<%-clientSecret%>" maxlength="100" type="text" placeholder="Type a secret" data-i18n="[placeholder]client.client-form.client-secret-placeholder">
 						</div>
 						<div id="clientSecretGenerated" class="span3">
-							<span class="uneditable-input">Generate on Save</span>
+							<span class="uneditable-input" data-i18n="client.client-form.generate-on-save">Generate on Save</span>
 						</div>
 						<div id="clientSecretHidden" class="span3"> 
 							<span class="uneditable-input span3">* * * * * * * * * * * *</span>
@@ -471,31 +471,30 @@
 			</div>
 
             <div class="control-group" id="tokenEndpointAuthSigningAlg">
-                <label class="control-label">Token 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" <%-tokenEndpointAuthSigningAlg == null ? 'selected ' : ''%>>Any allowed</option>
-						<option value="HS256" <%-tokenEndpointAuthSigningAlg == "HS256" ? 'selected' : ''%>>HMAC using SHA-256 hash algorithm</option>
-						<option value="HS384" <%-tokenEndpointAuthSigningAlg == "HS384" ? 'selected' : ''%>>HMAC using SHA-384 hash algorithm</option>
-						<option value="HS512" <%-tokenEndpointAuthSigningAlg == "HS512" ? 'selected' : ''%>>HMAC using SHA-512 hash algorithm</option>
-						<option value="RS256" <%-tokenEndpointAuthSigningAlg == "RS256" ? 'selected' : ''%>>RSASSA using SHA-256 hash algorithm</option>
-						<option value="RS384" <%-tokenEndpointAuthSigningAlg == "RS384" ? 'selected' : ''%>>RSASSA using SHA-384 hash algorithm</option>
-						<option value="RS512" <%-tokenEndpointAuthSigningAlg == "RS512" ? 'selected' : ''%>>RSASSA using SHA-512 hash algorithm</option>
-						<option value="ES256" <%-tokenEndpointAuthSigningAlg == "ES256" ? 'selected' : ''%>>ECDSA using P-256 curve and SHA-256 hash algorithm</option>
-						<option value="ES384" <%-tokenEndpointAuthSigningAlg == "ES384" ? 'selected' : ''%>>ECDSA using P-384 curve and SHA-384 hash algorithm</option>
-						<option value="ES512" <%-tokenEndpointAuthSigningAlg == "ES512" ? 'selected' : ''%>>ECDSA using P-512 curve and SHA-512 hash algorithm</option>
+						<option value="default" <%-tokenEndpointAuthSigningAlg == null ? 'selected ' : ''%> data-i18n="client.client-form.token-signing-any">Any allowed</option>
+						<option value="HS256" <%-tokenEndpointAuthSigningAlg == "HS256" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-hmac-256">HMAC using SHA-256 hash algorithm</option>
+						<option value="HS384" <%-tokenEndpointAuthSigningAlg == "HS384" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-hmac-384">HMAC using SHA-384 hash algorithm</option>
+						<option value="HS512" <%-tokenEndpointAuthSigningAlg == "HS512" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-hmac-512">HMAC using SHA-512 hash algorithm</option>
+						<option value="RS256" <%-tokenEndpointAuthSigningAlg == "RS256" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-rsassa-256">RSASSA using SHA-256 hash algorithm</option>
+						<option value="RS384" <%-tokenEndpointAuthSigningAlg == "RS384" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-rsassa-384">RSASSA using SHA-384 hash algorithm</option>
+						<option value="RS512" <%-tokenEndpointAuthSigningAlg == "RS512" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-rsassa-512">RSASSA using SHA-512 hash algorithm</option>
+						<option value="ES256" <%-tokenEndpointAuthSigningAlg == "ES256" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-ecdsa-256">ECDSA using P-256 curve and SHA-256 hash algorithm</option>
+						<option value="ES384" <%-tokenEndpointAuthSigningAlg == "ES384" ? 'selected' : ''%> data-i18n="client.client-form.token-signing-ecdsa-384">ECDSA using P-384 curve and SHA-384 hash algorithm</option>
+						<option value="ES512" <%-tokenEndpointAuthSigningAlg == "ES512" ? 'selected' : ''%> data-i18n="client.client-form.token-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>
+				<label class="control-label" data-i18n="client.client-form.jwk-set">JWK Set</label>
 				<div class="controls">
 					<input placeholder="https://" value="<%-jwksUri%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL for the client's JSON Web Key set</p>
+					<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>
 
 	<div class="tab-pane" id="client-token-tab">