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 aa0706e4a..f7e23332c 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
@@ -82,8 +82,9 @@
             "initiate-login": "Initiate Login",
             "initiate-login-help": "URL to initiate login on the client",
             "introspection": "Introspection",
-            "jwk-set": "JWK Set",
-            "jwk-set-help": "URL for the client's JSON Web Key set",
+            "jwk-set": "Public Key Set",
+            "jwk-set-help": "URL for the client's JSON Web Key set (must be reachable by the server)",
+            "jwk-set-value-help": "URL for the client's JSON Web Key set (must be reachable by the server)",
             "logo": "Logo",
             "logo-help": "URL that points to a logo image, will be displayed on approval page",
             "main": "Main",
@@ -451,6 +452,9 @@
 			"authorize": "Authorize",
 			"deny": "Deny"
 		}
+	},
+	"error": {
+		"title": "Error"
 	}
 	
 }
\ No newline at end of file
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 c04f356fe..2f3386ed4 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
@@ -511,7 +511,7 @@
 				</div>
 				<div class="controls" id="jwks">
 					<textarea  class="input-xlarge" placeholder="{ &quot;keys&quot: [ ] }" maxlength="4000" type="text" rows="8"><%- (jwks != null ? JSON.stringify(jwks, null, '  ') : "") %></textarea>
-					<p class="help-block" data-i18n="client.client-form.jwk-set-value-help">JSON Web Key set</p>
+					<p class="help-block" data-i18n="client.client-form.jwk-set-value-help">Key set value (must be a valid JWK Set formatted key)</p>
 				</div>
 			</div>
 	</div>