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 b385958db..810c6c5fd 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
@@ -296,7 +296,8 @@
             "confirm": "Are you sure sure you would like to delete this scope? Clients that have this scope will still be able to ask for it.",
             "new": "New Scope",
             "text": "There are no system scopes defined. Clients may still have custom scopes.",
-            "tooltip-restricted": "This scope can be used only by adminisrtators. It is not available for dynamic registration."
+            "tooltip-restricted": "This scope can be used only by adminisrtators. It is not available for dynamic registration.",
+            "tooltip-default": "This scope is automatically assigned to newly registered clients."
         }
     },
     "token": {
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/scope.js b/openid-connect-server-webapp/src/main/webapp/resources/js/scope.js
index 47234d7f9..732d44456 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/scope.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/scope.js
@@ -99,7 +99,8 @@ var SystemScopeView = Backbone.View.extend({
     render:function (eventName) {
         this.$el.html(this.template(this.model.toJSON()));
 
-        this.$('.restricted').tooltip({title: $.t('scope.system-scope-table.tooltip-restricted')});
+        $('.restricted', this.el).tooltip({title: $.t('scope.system-scope-table.tooltip-restricted')});
+        $('.default', this.el).tooltip({title: $.t('scope.system-scope-table.tooltip-default')});
         
         return this;
         $(this.el).i18n();
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/admin.html b/openid-connect-server-webapp/src/main/webapp/resources/template/admin.html
index 831473959..eb1511c0a 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/admin.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/admin.html
@@ -36,7 +36,7 @@
 		<% if (!opt.toggle) { %>
 			<a class="btn btn-small btn-delete-list-item" href="#"><i class="icon-minus-sign"></i></a>
 		<% } else { %>
-			<input class="checkbox-list-item" type="checkbox" <%- opt.checked ? 'checked="checked"' : '' %> />
+			<input class="checkbox checkbox-list-item" type="checkbox" <%- opt.checked ? 'checked="checked"' : '' %> />
 		<% } %>
 	</td>
 </script>
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/scope.html b/openid-connect-server-webapp/src/main/webapp/resources/template/scope.html
index 8df4cad33..1b32d104c 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/scope.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/scope.html
@@ -47,6 +47,9 @@
 
 <script type="text/html" id="tmpl-system-scope">
 	<td>
+		<% if (defaultScope) { %>
+			<span class="label label-success default"><i class="icon-flag icon-white"></i></span>
+		<% } %>
 		<% if (restricted) { %>
 			<span class="label label-warning restricted"><i class="icon-ban-circle icon-white"></i></span>
 		<% } %>