diff --git a/admin_manual/configuration_user/index.rst b/admin_manual/configuration_user/index.rst
index 9eb13876e..f73bde281 100644
--- a/admin_manual/configuration_user/index.rst
+++ b/admin_manual/configuration_user/index.rst
@@ -7,6 +7,7 @@ User Management
     
     user_configuration
     reset_admin_password
+    reset_user_password
     user_auth_ftp_smb_imap
     user_auth_ldap
     user_auth_ldap_cleanup
diff --git a/admin_manual/configuration_user/reset_user_password.rst b/admin_manual/configuration_user/reset_user_password.rst
new file mode 100644
index 000000000..4268c63fb
--- /dev/null
+++ b/admin_manual/configuration_user/reset_user_password.rst
@@ -0,0 +1,14 @@
+=========================
+Resetting a User Password
+=========================
+
+The ownCloud login screen displays a **Wrong password. Reset it?** message 
+after a user enters an incorrect password, and then ownCloud automatically 
+resets their password. However, if you are using a read-only authentication 
+backend such as LDAP or Active Directory, this will not work. In this case you 
+may specify a custom URL in your ``config.php`` file to direct your user to a 
+server than can handle an automatic reset::
+
+ 'lost_password_link' => 'https://example.org/link/to/password/reset',
+ 
+ 
\ No newline at end of file
diff --git a/admin_manual/whats_new_admin.rst b/admin_manual/whats_new_admin.rst
index 19cc66800..d2973a746 100644
--- a/admin_manual/whats_new_admin.rst
+++ b/admin_manual/whats_new_admin.rst
@@ -17,4 +17,8 @@ ownCloud has many improvements. Some of our new features are:
   :ref:`password_policy_label`.
 * New command to transfer files from one user to another. 
   See :ref:`transfer_userfiles_label`.
-* Streamlined Federation sharing. See :ref:`label-direct-share-link`.
+* Streamlined Federation sharing with user and group name auto-fill. See 
+  :ref:`label-direct-share-link`.
+* Configurable password reset URL. See 
+  :doc:`configuration_user/reset_user_password`
+  
\ No newline at end of file