diff --git a/changelog.d/6028.feature b/changelog.d/6028.feature
new file mode 100644
index 000000000000..cf603fa0c6a5
--- /dev/null
+++ b/changelog.d/6028.feature
@@ -0,0 +1 @@
+Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 2ff57f0bff4f..bd486d97b634 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1095,7 +1095,7 @@ uploads_path: "DATADIR/uploads"
 # https://matrix.org/docs/spec/identity_service/latest
 #
 account_threepid_delegates:
-    #email: https://example.com     # Delegate email sending to matrix.org
+    #email: https://example.com     # Delegate email sending to example.org
     #msisdn: http://localhost:8090  # Delegate SMS sending to this local process
 
 # Users who register on this homeserver will automatically be joined
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 8766917ddd54..44cc26be3753 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -369,7 +369,7 @@ def generate_config_section(self, generate_secrets=False, **kwargs):
         # https://matrix.org/docs/spec/identity_service/latest
         #
         account_threepid_delegates:
-            #email: https://example.com     # Delegate email sending to matrix.org
+            #email: https://example.com     # Delegate email sending to example.org
             #msisdn: http://localhost:8090  # Delegate SMS sending to this local process
 
         # Users who register on this homeserver will automatically be joined