diff --git a/openid-connect-server/src/main/webapp/resources/js/admin.js b/openid-connect-server/src/main/webapp/resources/js/admin.js
index d37d8d78c..acc152018 100644
--- a/openid-connect-server/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server/src/main/webapp/resources/js/admin.js
@@ -779,7 +779,10 @@
     		var json = {whiteList: this.model.toJSON(), client: this.options.client.toJSON()};
     		
     		this.$el.html(this.template(json));
-    		return this;
+
+    		this.$('.dynamically-registered').tooltip({title: 'This client was dynamically registered'});
+
+            return this;
     	},
     	
     	events:{
diff --git a/openid-connect-server/src/main/webapp/resources/template/admin.html b/openid-connect-server/src/main/webapp/resources/template/admin.html
index 14fe517fc..634507c3d 100644
--- a/openid-connect-server/src/main/webapp/resources/template/admin.html
+++ b/openid-connect-server/src/main/webapp/resources/template/admin.html
@@ -272,6 +272,12 @@
 <!-- whitelist -->
 
 <script type="text/html" id="tmpl-whitelist">
+	<td>
+		<% if (client.dynamicallyRegistered) { %>
+		<span class="dynamically-registered"><i class="icon-cog"></i></span>
+		<% } %>
+	</td>
+
     <td>
         <%=whiteList.clientId%>
         <blockquote><small><%=client.clientDescription%></small></blockquote>
@@ -296,6 +302,7 @@
     <table id="whitelist-table" class="table">
         <thead>
         <tr>
+			<th></th>
             <th>Client ID</th>
             <th>Application Name</th>
             <th></th>