diff --git a/images/am/current/graviteeio-am-userguide-um-create-user.png b/images/am/current/graviteeio-am-userguide-um-create-user.png
index 9ac6255c0..15f977921 100644
Binary files a/images/am/current/graviteeio-am-userguide-um-create-user.png and b/images/am/current/graviteeio-am-userguide-um-create-user.png differ
diff --git a/images/am/current/graviteeio-am-userguide-um-search-users.png b/images/am/current/graviteeio-am-userguide-um-search-users.png
index 3281a8491..d13f90f84 100644
Binary files a/images/am/current/graviteeio-am-userguide-um-search-users.png and b/images/am/current/graviteeio-am-userguide-um-search-users.png differ
diff --git a/images/am/current/graviteeio-am-userguide-um-user-assigned-dynamic-roles.png b/images/am/current/graviteeio-am-userguide-um-user-assigned-dynamic-roles.png
index d4c05e800..1c61e42e7 100644
Binary files a/images/am/current/graviteeio-am-userguide-um-user-assigned-dynamic-roles.png and b/images/am/current/graviteeio-am-userguide-um-user-assigned-dynamic-roles.png differ
diff --git a/images/am/current/graviteeio-am-userguide-um-user-role-mapping.png b/images/am/current/graviteeio-am-userguide-um-user-role-mapping.png
index f79a7a855..e8d9880c0 100644
Binary files a/images/am/current/graviteeio-am-userguide-um-user-role-mapping.png and b/images/am/current/graviteeio-am-userguide-um-user-role-mapping.png differ
diff --git a/images/am/current/graviteeio-am-userguide-um-user-update-usename.png b/images/am/current/graviteeio-am-userguide-um-user-update-usename.png
new file mode 100644
index 000000000..5d3d76dfa
Binary files /dev/null and b/images/am/current/graviteeio-am-userguide-um-user-update-usename.png differ
diff --git a/pages/am/3.x/user-guide/user-management/user/user-guide-users.adoc b/pages/am/3.x/user-guide/user-management/user/user-guide-users.adoc
index dec5ba9c6..a18683187 100644
--- a/pages/am/3.x/user-guide/user-management/user/user-guide-users.adoc
+++ b/pages/am/3.x/user-guide/user-management/user/user-guide-users.adoc
@@ -175,6 +175,24 @@ An email will be sent to the user with instructions.
 
 image::{% link images/am/current/graviteeio-am-userguide-um-pre-registration-mail.png %}[]
 
+=== Update the username
+[label label-version]#New in version 3.21#
+
+You can update the username of your user.
+
+image::{% link images/am/current/graviteeio-am-userguide-um-user-update-usename.png %}[]
+
+. link:{{ '/am/current/am_userguide_authentication.html' | relative_url }}[Log in to AM Console^].
+. Click *Settings > Users*
+. Select your user
+. Input the new username
+. Click on the *Update Username* button
+
+NOTE: Updating the username is only available via the console and the management-api.
+
+WARNING: Updating the username will automatically update it in the user's identity provider that support
+direct update of the user: HTTP Provider, JDBC, MongoDB and Inline. Other IDPs are not supported.
+
 === User roles
 
 You can assign roles directly from the user profile, or from the identity provider role mapping feature.