diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index a4ac292b5c..2313cbe6b1 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -391,10 +391,21 @@ function badgeSidebarForDifferences(changedElement) {
   // figure out which group this input is in
   var panelParentID = changedElement.closest('.panel').attr('id')
   
-  // get a JSON representation of that section
-  var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID]
-  var initialPanelJSON = Settings.initialValues[panelParentID]
-  
+  // if the panel contains non-grouped settings, the initial value is Settings.initialValues
+  var isGrouped = $(panelParentID).hasClass('grouped');
+
+  if (isGrouped) {
+    var initialPanelJSON = Settings.initialValues[panelParentID];
+    
+    // get a JSON representation of that section
+    var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID];
+  } else {
+    var initialPanelJSON = Settings.initialValues;
+
+    // get a JSON representation of that section
+    var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true);
+  }
+
   var badgeValue = 0
   
   // badge for any settings we have that are not the same or are not present in initialValues
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index bdfd3f9f48..ad6ed0f41c 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -10,8 +10,9 @@
     <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col" class="hidden-xs" data-spy="affix" data-offset-top="55">
       <script id="list-group-template" type="text/template">
         <% _.each(descriptions, function(group){ %>
+          <% panelID = group.name ? group.name : group.label %>
           <li>
-            <a href="#<%-group.name %>" class="list-group-item">
+            <a href="#<%- panelID %>" class="list-group-item">
               <span class="badge"></span>
               <%- group.label %>
             </a>
@@ -37,7 +38,12 @@
           <% if (isAdvanced) { %>
             <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
           <% } %>
-          <div class="panel panel-default <%- (isAdvanced) ? 'advanced-setting' : '' %>" id="<%- group.name %>">
+          
+          <% isGrouped = !!group.name %>
+          <% panelID = isGrouped ? group.name : group.label %>
+
+          <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>" 
+               id="<%- panelID %>">
             <div class="panel-heading">
               <h3 class="panel-title"><%- group.label %></h3>
             </div>
@@ -55,6 +61,7 @@
               <% }%>
             </div>
           </div>
+
         <% }); %>
       </script>