diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java b/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java
index 6b8479999ac..3be3f23f73e 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ClientConfigGenerate.java
@@ -95,8 +95,8 @@ void pageHeader() {
       doc.println("<!-- Generated by : " + getClass().getName() + " -->\n");
       doc.println("Below are properties set in `accumulo-client.properties`"
           + " that configure [Accumulo clients]({{ page.docs_baseurl"
-          + " }}/getting-started/clients#connecting). All properties have been part"
-          + " of the API since 2.0.0 (unless otherwise specified):\n");
+          + " }}/getting-started/clients#creating-an-accumulo-client). All properties have"
+          + " been part of the API since 2.0.0 (unless otherwise specified):\n");
       doc.println("| Property | Default value | Since | Description |");
       doc.println("|----------|---------------|-------|-------------|");
     }
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index 61411cd2d04..c129c31f1dc 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -88,8 +88,12 @@ void prefixSection(Property prefix) {
     if (depr) {
       description += "*Deprecated since:* " + prefix.deprecatedSince() + "<br>";
       if (prefix.isReplaced()) {
-        description += "*Replaced by:* <a href=\"#" + prefix.replacedBy().getKey().replace(".", "_")
-            + "prefix\">" + prefix.replacedBy() + "</a><br>";
+        Property replacement = prefix.replacedBy();
+        String anchor = replacement.getKey().replace(".", "_");
+        if (replacement.getType() == PropertyType.PREFIX) {
+          anchor += "prefix";
+        }
+        description += "*Replaced by:* <a href=\"#" + anchor + "\">" + replacement + "</a><br>";
       }
     }
     description += strike(sanitize(prefix.getDescription()), depr);