diff --git a/admin_manual/configuration_files/external_storage/auth_mechanisms.rst b/admin_manual/configuration_files/external_storage/auth_mechanisms.rst
index 779239640..87227fec8 100644
--- a/admin_manual/configuration_files/external_storage/auth_mechanisms.rst
+++ b/admin_manual/configuration_files/external_storage/auth_mechanisms.rst
@@ -25,11 +25,12 @@ Password-based Mechanisms
 The **Username and password** mechanism requires a manually-defined username and
 password. These get passed directly to the backend.
 
-The **Session credentials** mechanism uses the ownCloud login credentials of the
-user to connect to the storage. These are not stored anywhere on the server,
-but rather in the user session, giving increased security. The drawback is that
-sharing is disabled when this mechanism is in use, as ownCloud has no access
-to the storage credentials and so other users cannot use it.
+The **Log-in credentials, save in session** mechanism uses the ownCloud login 
+credentials of the user to connect to the storage. These are not stored anywhere 
+on the server, but rather in the user session, giving increased security. The 
+drawbacks are that sharing is disabled when this mechanism is in use, as 
+ownCloud has no access to the storage credentials, and background file scanning 
+does not work.
 
 Public-key Mechanisms
 ---------------------
diff --git a/admin_manual/configuration_files/external_storage/images/auth_mechanism.png b/admin_manual/configuration_files/external_storage/images/auth_mechanism.png
index 9dab5f8f8..fe12450cf 100644
Binary files a/admin_manual/configuration_files/external_storage/images/auth_mechanism.png and b/admin_manual/configuration_files/external_storage/images/auth_mechanism.png differ
diff --git a/admin_manual/configuration_files/external_storage/images/enable-app.png b/admin_manual/configuration_files/external_storage/images/enable-app.png
new file mode 100644
index 000000000..ce2fa157b
Binary files /dev/null and b/admin_manual/configuration_files/external_storage/images/enable-app.png differ
diff --git a/admin_manual/configuration_files/external_storage/images/enable_app.png b/admin_manual/configuration_files/external_storage/images/enable_app.png
deleted file mode 100644
index b2b222fd8..000000000
Binary files a/admin_manual/configuration_files/external_storage/images/enable_app.png and /dev/null differ
diff --git a/admin_manual/configuration_files/external_storage_configuration_gui.rst b/admin_manual/configuration_files/external_storage_configuration_gui.rst
index 6e645fb03..6e7fe2e39 100644
--- a/admin_manual/configuration_files/external_storage_configuration_gui.rst
+++ b/admin_manual/configuration_files/external_storage_configuration_gui.rst
@@ -11,7 +11,7 @@ Enabling External Storage Support
 
 The External storage support application is enabled on your Apps page.
 
-.. figure:: external_storage/images/enable_app.png
+.. figure:: external_storage/images/enable-app.png
    :alt: Enable external storage on your Apps page.
 
 Storage Configuration
@@ -29,12 +29,10 @@ authentication mechanisms; some specific to the backend, others are more
 generic. See :doc:`external_storage/auth_mechanisms` for more detailed 
 information.
 
-When you select an authentication mechanism, the configuration 
-fields change as appropriate for the mechanism. Some backends are not yet 
-migrated to
-the new authentication mechanism system, and are displayed with a mechanism
-of **Built-in**. The SFTP backend, to give an example, supports both 
-password-based authentication and public key authentication.
+When you select an authentication mechanism, the configuration fields change as 
+appropriate for the mechanism. The SFTP backend, for one example, supports 
+**username and password**, **Log-in credentials, save in session**, and **RSA 
+public key**.
 
 .. figure:: external_storage/images/auth_mechanism.png
    :alt: An SFTP configuration example.
diff --git a/admin_manual/configuration_files/images/enable-app.png b/admin_manual/configuration_files/images/enable-app.png
new file mode 100644
index 000000000..ce2fa157b
Binary files /dev/null and b/admin_manual/configuration_files/images/enable-app.png differ