diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 542771c60e..bec8d19119 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -505,7 +505,7 @@ function createDomainIDPrompt(callback) {
   swal({
     title: 'Finish Registering Domain',
     type: 'input',
-    text: 'Enter a label for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>This is a required step for registration.</br></br>',
+    text: 'Enter a label for this Domain Server.</br></br>This will help you identify which domain ID belongs to which server.</br></br>This is a required step for registration.</br></br>Acceptable characters are [A-Z][a-z0-9]+-_.</br',
     showCancelButton: true,
     confirmButtonText: "Create",
     closeOnConfirm: false,
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index b54b3d658d..38842cf79f 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -195,6 +195,9 @@ function promptToCreateDomainID() {
           "metaverse": {
             "automatic_networking": "full",
             "id": domainID
+          },
+          "descriptors": {
+              "world_name": label
           }
         };