diff --git a/docs/keycloak.md b/docs/keycloak.md
index a2423ae55d7ddd7f36e81201481c9d4aca046a16..d6a5e1d5331e82c7c6cdc39eff0c76da2630f5e8 100644
--- a/docs/keycloak.md
+++ b/docs/keycloak.md
@@ -20,7 +20,7 @@ Under the mappers tab, create a new mapper:
 - claim JSON type - long
 - add to userinfo - on
 
-Create another mapper:
+Create username mapper:
 - name - username
 - mapper type - user property
 - property - username
@@ -29,6 +29,15 @@ Create another mapper:
 - add to userinfo - on
 - all other sliders off
 
+Create email mapper:
+- name - email
+- mapper type - user property
+- property - email
+- token claim name - email
+- claim JSON type - string
+- add to userinfo - on
+- all other sliders off
+
 Add mattermostid to existing user:
 - Login to keycloak Admin Console with the master realm user
 - Go to your realm