diff --git a/messages/en-US.json b/messages/en-US.json
index 76908b292..5e8af2617 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -6,7 +6,7 @@
     "setupOrgName": "Organization Name",
     "orgDisplayName": "This is the display name of your organization.",
     "orgId": "Organization ID",
-    "setupIdentifierMessage": "This is the unique identifier for your organization. This is separate from the display name.",
+    "setupIdentifierMessage": "This is the unique identifier for your organization.",
     "setupErrorIdentifier": "Organization ID is already taken. Please choose a different one.",
     "componentsErrorNoMemberCreate": "You are not currently a member of any organizations. Create an organization to get started.",
     "componentsErrorNoMember": "You are not currently a member of any organizations.",
@@ -1445,7 +1445,7 @@
     "clientNamePlaceholder": "Client name",
     "address": "Address",
     "subnetPlaceholder": "Subnet",
-    "addressDescription": "The address that this client will use for connectivity",
+    "addressDescription": "The internal address of the client in the Pangolin network. Must fall within the organization's subnet.",
     "selectSites": "Select sites",
     "sitesDescription": "The client will have connectivity to the selected sites",
     "clientInstallOlm": "Install Olm",
@@ -1618,7 +1618,7 @@
     "siteAcceptClientConnections": "Accept Client Connections",
     "siteAcceptClientConnectionsDescription": "Allow other devices to connect through this Newt instance as a gateway using clients.",
     "siteAddress": "Site Address",
-    "siteAddressDescription": "Specify the IP address of the host for clients to connect to. This is the internal address of the site in the Pangolin network for clients to address. Must fall within the Org subnet.",
+    "siteAddressDescription": "The internal address of the site in the Pangolin network. Must fall within the organization's subnet.",
     "autoLoginExternalIdp": "Auto Login with External IDP",
     "autoLoginExternalIdpDescription": "Immediately redirect the user to the external IDP for authentication.",
     "selectIdp": "Select IDP",
diff --git a/src/app/setup/page.tsx b/src/app/setup/page.tsx
index 65ffc7865..9669ee232 100644
--- a/src/app/setup/page.tsx
+++ b/src/app/setup/page.tsx
@@ -313,9 +313,9 @@ export default function StepperForm() {
                                                     </FormControl>
                                                     <FormMessage />
                                                     <FormDescription>
-                                                        Network subnet for this
-                                                        organization. A default
-                                                        value has been provided.
+                                                        The subnet for this
+                                                        organization's internal
+                                                        network.
                                                     </FormDescription>
                                                 </FormItem>
                                             )}