diff --git a/web/components/config/edit-instance-details.tsx b/web/components/config/edit-instance-details.tsx
index e5877effd..b258d8a04 100644
--- a/web/components/config/edit-instance-details.tsx
+++ b/web/components/config/edit-instance-details.tsx
@@ -71,6 +71,14 @@ export default function EditInstanceDetails() {
       </Title>
       <br />
 
+      <TextFieldWithSubmit
+        fieldName="name"
+        {...TEXTFIELD_PROPS_SERVER_NAME}
+        value={formDataValues.name}
+        initialValue={instanceDetails.name}
+        onChange={handleFieldChange}
+      />
+
       <TextFieldWithSubmit
         fieldName="instanceUrl"
         {...TEXTFIELD_PROPS_INSTANCE_URL}
@@ -81,13 +89,6 @@ export default function EditInstanceDetails() {
         onSubmit={handleSubmitInstanceUrl}
       />
 
-      <TextFieldWithSubmit
-        fieldName="name"
-        {...TEXTFIELD_PROPS_SERVER_NAME}
-        value={formDataValues.name}
-        initialValue={instanceDetails.name}
-        onChange={handleFieldChange}
-      />
       <TextFieldWithSubmit
         fieldName="summary"
         {...TEXTFIELD_PROPS_SERVER_SUMMARY}
@@ -106,16 +107,14 @@ export default function EditInstanceDetails() {
       {instanceDetails.logo && <img src={'/logo'} alt="uploaded logo" className="logo-preview" />}
       <br />
 
-      <Title level={3} className="section-title">
-        Owncast Directory Settings
-      </Title>
       <p className="description">
-        Would you like to appear in the{' '}
+        Increase your audience by appearing in the{' '}
         <a href="https://directory.owncast.online" target="_blank" rel="noreferrer">
           <strong>Owncast Directory</strong>
-        </a>
-        ?
+        </a>.  This is an external service run by the Owncast project.  <a href="https://owncast.online/docs/directory/">Learn more</a>.
+        {!yp.instanceUrl && <div><br/>You must set your server URL above to enable the directory.</div>}
       </p>
+
       <div className="config-yp-container">
         <ToggleSwitch
           fieldName="enabled"
diff --git a/web/utils/config-constants.tsx b/web/utils/config-constants.tsx
index 0a64bbb44..4bd3d636f 100644
--- a/web/utils/config-constants.tsx
+++ b/web/utils/config-constants.tsx
@@ -111,7 +111,7 @@ export const TEXTFIELD_PROPS_INSTANCE_URL = {
   configPath: 'yp',
   maxLength: 255,
   placeholder: 'https://owncast.mysite.com',
-  label: 'Instance URL',
+  label: 'Server URL',
   tip: 'The full url to your Owncast server.',
 };
 // MISC FIELDS
@@ -137,15 +137,15 @@ export const FIELD_PROPS_NSFW = {
   configPath: 'instanceDetails',
   label: 'NSFW?',
   tip:
-    "Turn this ON if you plan to steam explicit or adult content. You may want to respectfully set this flag so that unexpecting eyes won't accidentally see it from the Directory.",
+    "Turn this ON if you plan to steam explicit or adult content. Please respectfully set this flag so unexpected eyes won't accidentally see it in the Directory.",
 };
 
 export const FIELD_PROPS_YP = {
   apiPath: API_YP_SWITCH,
   configPath: 'yp',
-  label: 'Display in the Owncast Directory?',
+  label: 'Enable directory',
   tip:
-    'Turn this ON if you want to show up in the Owncast directory at https://directory.owncast.online.',
+    'Turn this ON if you want to show up in the directory.',
 };
 
 export const DEFAULT_VARIANT_STATE: VideoVariant = {