diff --git a/domain-server/resources/web/js/setup.js b/domain-server/resources/web/js/setup.js
index d92a35fb26..2f49fc0cc9 100644
--- a/domain-server/resources/web/js/setup.js
+++ b/domain-server/resources/web/js/setup.js
@@ -18,4 +18,16 @@ $(document).ready(function(){
       resizeFn();
       $(window).resize(resizeFn);
   });
+  
+  
+  var listSource = $('#list-group-template').html();
+  var listTemplate = _.template(listSource);
+
+  reloadSettings();
+
+  function reloadSettings() {
+    $.getJSON('describe-setup.json', function(data){
+      $('.list-group').html(listTemplate(data));
+    });
+  }
 });
\ No newline at end of file
diff --git a/domain-server/resources/web/settings/describe.json b/domain-server/resources/web/settings/describe-settings.json
similarity index 100%
rename from domain-server/resources/web/settings/describe.json
rename to domain-server/resources/web/settings/describe-settings.json
diff --git a/domain-server/resources/web/setup/describe-setup.json b/domain-server/resources/web/setup/describe-setup.json
new file mode 100644
index 0000000000..95370a5ff7
--- /dev/null
+++ b/domain-server/resources/web/setup/describe-setup.json
@@ -0,0 +1,31 @@
+{
+  "descriptions": {
+    "basic": {
+      "label": "Basic",
+      "settings": {
+        "http-username": {
+          "label": "HTTP Username",
+          "help": "Username used for basic HTTP authentication"
+        },
+        "http-password": {
+          "label": "HTTP Password",
+          "type": "password",
+          "help": "Password used for basic HTTP authentication"
+        }
+      }
+    },
+    "metaverse": {
+      "label": "Metaverse Registration",
+      "settings": {
+        "access-token": {
+          "label": "High Fidelity Access Token",
+          "help": "This is an access token generated on the <a href='https://data.highfidelity.io/tokens'>My Tokens</a> page of your High Fidelity account.<br/>Generate a token with the 'domains' scope and paste it here.<br/>This is required to associate this domain-server with a domain in your account."
+        },
+        "id": {
+          "label": "Domain ID",
+          "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
+        } 
+      }
+    }
+  }
+}
diff --git a/domain-server/resources/web/setup/index.shtml b/domain-server/resources/web/setup/index.shtml
index a095c7d0a9..0abda73e16 100644
--- a/domain-server/resources/web/setup/index.shtml
+++ b/domain-server/resources/web/setup/index.shtml
@@ -3,9 +3,13 @@
   <div class="col-md-3 col-sm-3" id="setup-sidebar-col">
     <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col" class="hidden-xs" data-spy="affix" data-offset-top="50">
       <div class="list-group">
-        <a href="#metaverse" class="list-group-item active">
-          Metaverse Registration
-        </a>
+        <script id="list-group-template" type="text/template">
+          <% _.each(descriptions, function(group, group_key){ %>
+            <a href="" class="list-group-item">
+              <%- group.label %>
+            </a>
+          <% }); %>
+        </script>
       </div>
       
       <button id="save-button" class="btn btn-success">Save and restart</button>
@@ -67,4 +71,5 @@
   
 <!--#include virtual="footer.html"-->
 <script src='/js/setup.js'></script>
+<script src='/js/underscore-1.5.0.min.js'></script>
 <!--#include virtual="page-end.html"-->
\ No newline at end of file
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 6dff445fca..746d775beb 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -21,7 +21,7 @@
 
 #include "DomainServerSettingsManager.h"
 
-const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/web/settings/describe.json";
+const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/web/settings/describe-settings.json";
 const QString SETTINGS_JSON_FILE_RELATIVE_PATH = "/resources/settings.json";
 
 DomainServerSettingsManager::DomainServerSettingsManager() :