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 66b45187c..5dbf7209a 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
@@ -237,7 +237,7 @@
         "or": " - OR - ",
         "regtoken-placeholder": "Enter Registration Access Token",
         "warning": "<strong>Warning!</strong> You MUST protect your <b>Client ID</b>, <b>Client Secret (if provided)</b>, and your <b>Registration Access Token</b>. If you lose your Client ID or Registration Access Token, you will no longer have access to your client's registration records and you will need to register a new client.",
-        "will-be-generated": "Will be generated"
+        "will-be-generated": "Will be generated by the server when the client is saved"
     },
     "grant": {
         "manage-approved-sites": "Manage Approved Sites",
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html b/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html
index f7c313321..bced781b1 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html
@@ -67,6 +67,8 @@
 <div class="tab-content">
 	<div class="tab-pane active" id="client-main-tab">
 
+		<div class="well">
+
 			<% if (client.client_id) { %>
 			<div class="control-group">
 				<div class="controls">
@@ -134,6 +136,7 @@
                 <% } %>
                 </div>
             </div>
+		</div>
 
             <div class="control-group" id="clientName">
                 <label class="control-label" data-i18n="client.client-form.client-name">Client name</label>