diff --git a/docs/configuring-playbook-cactus-comments.md b/docs/configuring-playbook-cactus-comments.md
index 744193aa4..e64c4c06e 100644
--- a/docs/configuring-playbook-cactus-comments.md
+++ b/docs/configuring-playbook-cactus-comments.md
@@ -38,4 +38,4 @@ ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start
 
 ## Usage
 
-To learn how to use cactus comments message @cactusbot:your-homeserver.com and type `help` or have a look in the [documentation](https://cactus.chat/docs/getting-started/quick-start/).
+To learn how to use cactus comments message @bot.cactusbot:your-homeserver.com and type `help` or have a look in the [documentation](https://cactus.chat/docs/getting-started/quick-start/).
diff --git a/roles/matrix-cactus-comments/defaults/main.yml b/roles/matrix-cactus-comments/defaults/main.yml
index d414d7ded..3e09b75de 100644
--- a/roles/matrix-cactus-comments/defaults/main.yml
+++ b/roles/matrix-cactus-comments/defaults/main.yml
@@ -17,7 +17,7 @@ matrix_cactus_comments_app_service_env_file: "{{ matrix_cactus_comments_base_pat
 matrix_cactus_comments_as_token: ''
 matrix_cactus_comments_hs_token: ''
 matrix_cactus_comments_homeserver_url: ''
-matrix_cactus_comments_user_id: "cactusbot"
+matrix_cactus_comments_user_id: "bot.cactusbot"
 
 matrix_cactus_comments_container_port: 5000