diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/client.html
index 026c64eea..d6d01c62c 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -87,7 +87,7 @@
     <div class="">
         <form>
             <fieldset>
-                <legend>Details for <%=clientId%></legend>
+                <legend>Details <%=(clientId != null ? 'for ' + clientId : '')%></legend>
 
                 <div class="well">