diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 081022bbe2..cef30b5782 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -66,10 +66,6 @@ span.port {
   margin-top: 10px;
 }
 
-.save-button:disabled {
-  opacity: .45;
-}
-
 #small-save-button {
   width: 100%;
   margin-bottom: 15px;
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index c436b47b9c..8bb02e6e94 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -64,15 +64,7 @@ $(document).ready(function(){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true)
     
-    $('.save-button').removeAttr('disabled')
-    
     badgeSidebarForDifferences($(this))
-    
-    if ($('span.badge:not(:empty)').length == 0) {
-      // if all badges are empty we have no changed values
-      // so we can disable the save button again
-      $('.save-button').attr('disabled', true)
-    }
   })
   
   $('#advanced-toggle-button').click(function(){
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index a26bc10343..54fbb02eca 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -22,7 +22,7 @@
       </ul>
       
       <button id="advanced-toggle-button" class="btn btn-info">Show advanced</button>
-      <button class="btn btn-success save-button" disabled>Save and restart</button>
+      <button class="btn btn-success save-button">Save and restart</button>
     </div>
   </div>
   
@@ -54,7 +54,7 @@
   </div>
   
   <div class="col-xs-12 hidden-sm hidden-md hidden-lg">
-    <button class="btn btn-success save-button" id="small-save-button" disabled>Save and restart</button>
+    <button class="btn btn-success save-button" id="small-save-button">Save and restart</button>
   </div>
 </div>
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index c4d3b5f977..4393f2557f 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -179,7 +179,7 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
     const QString CUSTOM_PORT_OPTION = "port";
     unsigned short domainServerPort = DEFAULT_DOMAIN_SERVER_PORT;
     
-    const QVariantMap& settingsMap = _settingsManager.getSettingsMap();
+    QVariantMap& settingsMap = _settingsManager.getSettingsMap();
 
     if (settingsMap.contains(CUSTOM_PORT_OPTION)) {
         domainServerPort = (unsigned short) settingsMap.value(CUSTOM_PORT_OPTION).toUInt();
@@ -206,7 +206,11 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
     
     // set our LimitedNodeList UUID to match the UUID from our config
     // nodes will currently use this to add resources to data-web that relate to our domain
-    nodeList->setSessionUUID(settingsMap.value(DOMAIN_CONFIG_ID_KEY).toString());
+    const QString METAVERSE_DOMAIN_ID_KEY_PATH = "metaverse.id";
+    const QVariant* idValueVariant = valueForKeyPath(settingsMap, METAVERSE_DOMAIN_ID_KEY_PATH);
+    if (idValueVariant) {
+        nodeList->setSessionUUID(idValueVariant->toString());
+    }
 
     connect(nodeList, &LimitedNodeList::nodeAdded, this, &DomainServer::nodeAdded);
     connect(nodeList, &LimitedNodeList::nodeKilled, this, &DomainServer::nodeKilled);