diff --git a/server_admin/topics/clients/oidc/proc-using-a-service-account.adoc b/server_admin/topics/clients/oidc/proc-using-a-service-account.adoc
index cf8b6dff50..21727b2bbb 100644
--- a/server_admin/topics/clients/oidc/proc-using-a-service-account.adoc
+++ b/server_admin/topics/clients/oidc/proc-using-a-service-account.adoc
@@ -63,7 +63,7 @@ Pragma: no-cache
 Only the access token is returned by default. No refresh token is returned and no user session is created
 on the {project_name} side upon successful authentication by default. Due to the lack of refresh token, re-authentication is required when the access token expires. However, this situation does not mean any additional overhead for the {project_name} server because sessions are not created by default.
 
-In this situation, logout is unnecessary. However, issued access tokens can be revoked by sending requests to the OAuth2 Revocation Endpoint as described in the <<_oidc-endpoints, OpenID Connect Endpoints>> section.
+In this situation, logout is unnecessary. However, issued access tokens can be revoked by sending requests to the OAuth2 Revocation Endpoint as described in the xref:con-oidc_{context}[OpenID Connect Endpoints] section.
 
 [role="_additional-resources"]
 .Additional resources
diff --git a/server_admin/topics/sso-protocols/con-oidc-auth-flows.adoc b/server_admin/topics/sso-protocols/con-oidc-auth-flows.adoc
index cd231eddf5..bc67396fbf 100644
--- a/server_admin/topics/sso-protocols/con-oidc-auth-flows.adoc
+++ b/server_admin/topics/sso-protocols/con-oidc-auth-flows.adoc
@@ -1,5 +1,5 @@
-[id="con-oidc-auth-flows_{context}"]
 
+[id="con-oidc-auth-flows_{context}"]
 ==== OIDC Auth Flows
 [role="_abstract"]
 OIDC has several methods, or flows, that clients or applications can use to authenticate users and receive _identity_ and _access_ tokens.  The method depends on the type of application or client requesting access.
diff --git a/server_admin/topics/users/con-required-actions.adoc b/server_admin/topics/users/con-required-actions.adoc
index e9cecc2697..da6e5052dd 100644
--- a/server_admin/topics/users/con-required-actions.adoc
+++ b/server_admin/topics/users/con-required-actions.adoc
@@ -21,7 +21,3 @@ Verify Email::
 Update Profile::
    The user must update profile information, such as name, address, email, and phone number.
 
-
-include::proc-setting-required-actions.adoc[leveloffset=3]
-include::proc-setting-default-required-actions.adoc[leveloffset=3]
-include::proc-enabling-terms-conditions.adoc[leveloffset=3]
diff --git a/server_admin/topics/users/proc-setting-default-required-actions.adoc b/server_admin/topics/users/proc-setting-default-required-actions.adoc
index b419b9b8fa..1cc61f50a1 100644
--- a/server_admin/topics/users/proc-setting-default-required-actions.adoc
+++ b/server_admin/topics/users/proc-setting-default-required-actions.adoc
@@ -1,3 +1,4 @@
+
 [id="proc-setting-default-required-actions_{context}"]
 = Setting required actions for all users