diff --git a/admin_manual/configuration/auth_ldap.rst b/admin_manual/configuration/auth_ldap.rst
index 1e5c85678..070d396a7 100644
--- a/admin_manual/configuration/auth_ldap.rst
+++ b/admin_manual/configuration/auth_ldap.rst
@@ -365,7 +365,7 @@ Group Member association:
 Special Attributes
 ~~~~~~~~~~~~~~~~~~
 
-.. figure:: ../images/ldap-advanced-settings-special-attributes-oc5.png
+.. figure:: ../images/ldap-advanced-3-attributes.png
 
    LDAP Advanced Settings, section Special Attributes
 
@@ -386,6 +386,9 @@ Email Field:
   ownCloud can read an LDAP attribute and set the user email
   there from. Specify the attribute here, otherwise keep it empty.
 
+  Although the wizard offers you to check login by email, the correct email
+  attribute is not detected and you need to specify it manually.
+
   * Example: *mail*
 
 User Home Folder Naming Rule:
diff --git a/admin_manual/images/ldap-advanced-3-attributes.png b/admin_manual/images/ldap-advanced-3-attributes.png
new file mode 100644
index 000000000..f0810d6f0
Binary files /dev/null and b/admin_manual/images/ldap-advanced-3-attributes.png differ
diff --git a/admin_manual/images/ldap-advanced-settings-special-attributes-oc5.png b/admin_manual/images/ldap-advanced-settings-special-attributes-oc5.png
deleted file mode 100644
index 3e8d4c7c8..000000000
Binary files a/admin_manual/images/ldap-advanced-settings-special-attributes-oc5.png and /dev/null differ