diff --git a/apps/docs/content/guides/integrate/login/hosted-login.mdx b/apps/docs/content/guides/integrate/login/hosted-login.mdx
index 7dc6c5ade..46e818855 100644
--- a/apps/docs/content/guides/integrate/login/hosted-login.mdx
+++ b/apps/docs/content/guides/integrate/login/hosted-login.mdx
@@ -59,12 +59,12 @@ ZITADEL offers various [identity provider templates](/guides/integrate/identity-
### Multi-tenancy authentication
-ZITADEL simplifies multi-tenancy authentication by securely managing authentication for multiple tenants, called [Organizations](/guides/manage/console/organizations-overview), within a single [instance](/guides/manage/console/organizations-overview), within a single [instance](/concepts/structure/instance).
+ZITADEL simplifies multi-tenancy authentication by securely managing authentication for multiple tenants, called [Organizations](/guides/manage/console/organizations-overview), within a single [instance](/concepts/structure/instance).
Key features include:
1. **Secure Tenant Isolation**: Ensures robust security measures to prevent unauthorized access between tenants, maintaining data privacy and compliance. [Administrators](/concepts/structure/administrators) for an organization have only access to data and settings within their Organization.
-2. **Custom Authentication Settings**: Allows tailored [authentication settings](/guides/manage/console/default-settings#login-behavior-and-access), [branding](/guides/manage/customize/branding), and policies for each tenant.
+2. **Custom Authentication Settings**: Allows tailored [authentication settings](/guides/manage/console/default-settings#login-behavior-and-security), [branding](/guides/manage/customize/branding), and policies for each tenant.
3. **Centralized Management**: Provides [centralized administration](/guides/manage/console/administrators) for efficient management across all tenants.
4. **Scalability and Flexibility**: Scales seamlessly to accommodate growing organizations of all sizes.
5. **Domain Discovery**: Starting on a central login page, route users to their tenant based on their email address or other user attributes. Authentication settings will be applied automatically based on the organization's policies, this includes routing users seamlessly to third party identity providers like [Entra ID](/guides/integrate/identity-providers/azure-ad-oidc).
@@ -98,7 +98,7 @@ ZITADEL's hosted login page offers [many self-service flows](/concepts/features/
Developers use the self-service functionalities to reduce manual tasks and improve user experience.
Key features include:
-### Password reset
+#### Password reset
Unauthenticated users can request a password reset after providing the loginname during the login flow.
@@ -110,7 +110,7 @@ Unauthenticated users can request a password reset after providing the loginname
Users are automatically prompted to provide a second factor, when
-- Instance or organization [login policy](/guides/manage/console/default-settings#login-behavior-and-access) is set
+- Instance or organization [login policy](/guides/manage/console/default-settings#login-behavior-and-security) is set
- Requested by the client
- A multi-factor is set up for the user
diff --git a/apps/docs/content/guides/manage/console/_create-user.mdx b/apps/docs/content/guides/manage/console/_create-user.mdx
index b24aab6d0..f6675cef6 100644
--- a/apps/docs/content/guides/manage/console/_create-user.mdx
+++ b/apps/docs/content/guides/manage/console/_create-user.mdx
@@ -38,7 +38,7 @@ In this case please enable the Feature Flag "Use V2 Api in Management Console fo
-You can prompt the user to add a second factor method too by checking the **Force MFA** toggle in [Login behaviour settings](/guides/manage/console/default-settings#login-behavior-and-access).
+You can prompt the user to add a second factor method too by checking the **Force MFA** toggle in [Login behaviour settings](/guides/manage/console/default-settings#login-behavior-and-security).
When logged in, a user can then manage the profile in the management console, adding a profile picture, external IDPs and Passkeys.
diff --git a/apps/docs/content/guides/manage/console/default-settings.mdx b/apps/docs/content/guides/manage/console/default-settings.mdx
index b9040f8e8..60ca314f9 100644
--- a/apps/docs/content/guides/manage/console/default-settings.mdx
+++ b/apps/docs/content/guides/manage/console/default-settings.mdx
@@ -19,7 +19,7 @@ When you configure your default settings, you can set the following:
- **Organizations**: A list of your organizations
- [**Features**](#features): Feature Settings let you try out new features before they become generally available. You can also disable features you are not interested in.
- [**Notification settings**](#notification-settings): Setup Notification and Email Server settings for initialization-, verification- and other mails. Setup Twilio as SMS notification provider.
-- [**Login Behavior and Access**](#login-behavior-and-access): Multifactor Authentication Options and Enforcement, Define whether passkeys are allowed or not, Set Login Lifetimes and advanced behavior for the login interface.
+- [**Login Behavior and Security**](#login-behavior-and-security): Multifactor Authentication Options and Enforcement, Define whether passkeys are allowed or not, Set Login Lifetimes and advanced behavior for the login interface.
- [**Identity Providers**](#identity-providers): Define IDPs which are available for all organizations
- [**Password Complexity**](#password-complexity): Requirements for Passwords ex. Symbols, Numbers, min length and more.
- [**Password Expiry**](#password-expiry): Set an expiry for passwords. After the expiration, a user will be prompted to change their password during the next login.
@@ -131,7 +131,7 @@ Setting a Verification Service Sid allows using the Twilio Verify Service instea
-## Login Behavior and Access
+## Login Behavior and Security
The Login Policy defines how the login process should look like and which authentication options a user has to authenticate.
diff --git a/apps/docs/content/guides/manage/console/organizations-overview.mdx b/apps/docs/content/guides/manage/console/organizations-overview.mdx
index c05a1e6f6..4eb0dfe2b 100644
--- a/apps/docs/content/guides/manage/console/organizations-overview.mdx
+++ b/apps/docs/content/guides/manage/console/organizations-overview.mdx
@@ -134,7 +134,7 @@ Do not delete the DNS verification record after success. ZITADEL re-checks domai
Organizations can inherit settings from the instance defaults or override them with specific policies. Settings configured at the Organization level take priority over Default settings.
-* [**Login Behavior and Access**](./default-settings#login-behavior-and-access): MFA options, passwordless authentication rules, and session lifetimes.
+* [**Login Behavior and Security**](./default-settings#login-behavior-and-security): MFA options, passwordless authentication rules, and session lifetimes.
* [**Identity Providers**](./default-settings#identity-providers): Configure IDPs available specifically for this organization.
* [**Password Complexity**](./default-settings#password-complexity): Specific requirements for passwords (length, symbols, etc.).
* [**Lockout**](./default-settings#lockout): Max login attempts before an account is locked.
diff --git a/apps/docs/content/guides/solution-scenarios/domain-discovery.mdx b/apps/docs/content/guides/solution-scenarios/domain-discovery.mdx
index 8f85b9004..7daeec6fb 100644
--- a/apps/docs/content/guides/solution-scenarios/domain-discovery.mdx
+++ b/apps/docs/content/guides/solution-scenarios/domain-discovery.mdx
@@ -29,7 +29,7 @@ Follow this guide to configure your ZITADEL instance for this scenario.
You will use the instance default settings for the login for the organization **CIAM**.
When opening `login.mycompany.com` then the login policy of the instance will be applied.
-This means that you have to set up the [Login and Access](/guides/manage/console/default-settings#login-behavior-and-access) Policy and [Identity Providers](/guides/manage/console/default-settings#identity-providers) for the **CIAM** users on the instance itself.
+This means that you have to set up the [Login and Access](/guides/manage/console/default-settings#login-behavior-and-security) Policy and [Identity Providers](/guides/manage/console/default-settings#identity-providers) for the **CIAM** users on the instance itself.
You can also configure these settings on the default organization (see below) and send the scope `urn:zitadel:iam:org:id:{id}` with every [auth request](https://zitadel.com/playgrounds/oidc).
@@ -44,7 +44,7 @@ The default organization will hold all unmatched users, ie. all users that are n
### Enable Domain Discovery
-In the [Login Behavior and Security Settings](/guides/manage/console/default-settings#login-behavior-and-access) enable "Domain discovery allowed"
+In the [Login Behavior and Security Settings](/guides/manage/console/default-settings#login-behavior-and-security) enable "Domain discovery allowed"
### Configure login with email
diff --git a/apps/docs/content/self-hosting/deploy/overview.mdx b/apps/docs/content/self-hosting/deploy/overview.mdx
index 2d21ab4ec..93dfaa4e4 100644
--- a/apps/docs/content/self-hosting/deploy/overview.mdx
+++ b/apps/docs/content/self-hosting/deploy/overview.mdx
@@ -14,7 +14,7 @@ Choose your platform and run ZITADEL with the most minimal configuration possibl
## Prerequisites
- For test environments, ZITADEL does not need many resources, 1 CPU and 512MB memory are more than enough. (With more CPU, the password hashing might be faster)
-- A PostgreSQL as only needed storage. Make sure to read our [Production Guide](/self-hosting/manage/production#prefer-postgre-sql) before you decide to use PostgreSQL.
+- A PostgreSQL instance. Make sure to check the **database configuration options** in our [Production Guide](/self-hosting/manage/production#prefer-postgre-sql).
## Releases