diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index ce1b27b08..ae4ee4eb6 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -28,6 +28,8 @@
   when replicating from a Galera cluster in case the primary master
   goes down.
 * MaxScale now has a systemd compatible watchdog.
+* Server setting `authenticator_options` is no longer used and any value is
+  ignored.
 
 For more details, please refer to:
 
diff --git a/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md b/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md
index 647d521fc..136836c48 100644
--- a/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md
+++ b/Documentation/Upgrading/Upgrading-To-MaxScale-2.3.md
@@ -60,3 +60,7 @@ type=monitor
 password=some-monitor-password
 ...
 ```
+
+## `authenticator_options` for servers is ignored
+
+Authenticator options are now only used with listeners.