diff --git a/examples/kerberos/README.md b/examples/kerberos/README.md
index e501f467a0..a05670da6f 100644
--- a/examples/kerberos/README.md
+++ b/examples/kerberos/README.md
@@ -75,7 +75,7 @@ with password `secret` .
 
 Then in your web browser open `http://localhost:8080/kerberos-portal` . You should be logged-in automatically through SPNEGO without displaying Keycloak login screen.
 Keycloak will also transmit the delegated GSS credential to the application inside access token and application will be able to login with this credential
-to the LDAP server and retrieve some data from it (Actually it just retrieve few simple data about authenticated user himself).
+to the LDAP server and retrieve some data from it (Actually it just retrieve few simple data about authenticated user themself).
 
 
 Troubleshooting
diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java
index 22040838ed..4d5b1773a6 100644
--- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java
+++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java
@@ -75,7 +75,7 @@ public class MSADUserAccountControlStorageMapper extends AbstractLDAPStorageMapp
 
     @Override
     public LDAPOperationDecorator beforePasswordUpdate(UserModel user, LDAPObject ldapUser, UserCredentialModel password) {
-        // Not apply policies if password is reset by admin (not by user himself)
+        // Not apply policies if password is reset by admin (not by user themself)
         if (password.isAdminRequest()) {
             return null;
         }
diff --git a/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties b/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties
index 6d151ffc87..e6aa6aa342 100644
--- a/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties
+++ b/themes/src/main/resources-community/theme/base/admin/messages/admin-messages_de.properties
@@ -907,7 +907,7 @@ action=Aktion
 #client-scopes.evaluate.granted-realm-effective-roles.tooltip=Client has scope mappings for these roles. Those roles will be in the access token issued to this client if authenticated user is member of them
 #client-scopes.evaluate.granted-client-effective-roles=Granted Effective Client Roles
 #generated-access-token=Generated Access Token
-#generated-access-token.tooltip=See the example token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles, which the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user himself
+#generated-access-token.tooltip=See the example token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles, which the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user themself
 
 manage=Verwalten
 authentication=Authentifizierung
diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
index d20231e264..ba9ca09757 100644
--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -1156,9 +1156,9 @@ client-scopes.evaluate.granted-realm-effective-roles=Granted Effective Realm Rol
 client-scopes.evaluate.granted-realm-effective-roles.tooltip=Client has scope mappings for these roles. Those roles will be in the access token issued to this client if the authenticated user is a member of them
 client-scopes.evaluate.granted-client-effective-roles=Granted Effective Client Roles
 generated-access-token=Generated Access Token
-generated-access-token.tooltip=See the example access token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user himself 
+generated-access-token.tooltip=See the example access token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user themselves 
 generated-id-token=Generated ID Token
-generated-id-token.tooltip=See the example ID Token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user himself
+generated-id-token.tooltip=See the example ID Token, which will be generated and sent to the client when selected user is authenticated. You can see claims and roles that the token will contain based on the effective protocol mappers and role scope mappings and also based on the claims/roles assigned to user themselves
 generated-user-info=Generated User Info
 generated-user-info.tooltip=See the example User Info, which will be provided by the User Info Endpoint