diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index 1836daae2..7deec7ac2 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -564,6 +564,12 @@ var ClientFormView = Backbone.View.extend({
             	
             	$('#modalAlert .modal-body').html(_self.clientSavedTemplate(_self.model.toJSON()));
             	
+            	$('#modalAlert').on('click', '#clientSaveShow', function(event) {
+            		event.preventDefault();
+            		$('#clientSaveShow').hide();
+            		$('#savedClientSecret').show();
+            	});
+            	
             	$('#modalAlert').modal({
             		'backdrop': 'static',
             		'keyboard': true,
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 8b20b749a..8c0dc9790 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
@@ -655,7 +655,7 @@
 	</div>
 	<% if (generateClientSecret && clientSecret != null && clientSecret != '') { %>
 	<div>
-		<strong>Secret:</strong> <code><%= clientSecret %></code>
+		<strong>Secret:</strong> <button class="btn btn-mini" id="clientSaveShow">Show Secret</button><code id="savedClientSecret" class="hide" style="word-wrap: break-word;"><%= clientSecret %></code>
 	</div>
 	<% } else { %>
 	<div>