diff --git a/admin_manual/configuration_user/index.rst b/admin_manual/configuration_user/index.rst
index f73bde281dc..f047572707f 100644
--- a/admin_manual/configuration_user/index.rst
+++ b/admin_manual/configuration_user/index.rst
@@ -8,7 +8,8 @@ User Management
     user_configuration
     reset_admin_password
     reset_user_password
+    user_password_policy
     user_auth_ftp_smb_imap
     user_auth_ldap
     user_auth_ldap_cleanup
-    user_provisioning_api
\ No newline at end of file
+    user_provisioning_api
diff --git a/admin_manual/configuration_user/user_password_policy.rst b/admin_manual/configuration_user/user_password_policy.rst
new file mode 100644
index 00000000000..c8be05b4414
--- /dev/null
+++ b/admin_manual/configuration_user/user_password_policy.rst
@@ -0,0 +1,16 @@
+========================
+User Password Policy App
+========================
+
+A password policy is a set of rules designed to enhance computer security by encouraging users to employ strong passwords and use them properly. 
+
+You can configure 
+
+* a minimal length of a password. Default is 10 characters.
+* to forbid common passwords like 'california' or 'enterprise'.  
+* enforce upper and lower case characters
+* Enforce numeric characters
+* Enforce special characters like ! or :
+
+.. figure:: ../images/user_password_policy_configuration_app.png
+
diff --git a/admin_manual/images/user_password_policy_configuration_app.png b/admin_manual/images/user_password_policy_configuration_app.png
new file mode 100644
index 00000000000..6101b28730b
Binary files /dev/null and b/admin_manual/images/user_password_policy_configuration_app.png differ