diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f4ffd65..f16f98fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 * Anonymous chat user: remember the chosen nickname in sessionStorage, to avoid entering it again too often.
 * Fix: if an anonymous chat user enter spaces in the nickname choice, it will allows them to keep the random nickname.
+* Authenticated users: if current user nickname is already used in the room, automatically add a suffix.
 * Translation updates: German, French.
 * New Swedish translations.
 
diff --git a/conversejs/lib/converse-params.ts b/conversejs/lib/converse-params.ts
index 3e59ea21..fffd6149 100644
--- a/conversejs/lib/converse-params.ts
+++ b/conversejs/lib/converse-params.ts
@@ -156,9 +156,8 @@ function _fillAuthenticatedParams (initConverseParams: InitConverseJSParams, aut
   params.password = auth.password
   if (auth.nickname) {
     params.nickname = auth.nickname
-  } else {
-    params.muc_nickname_from_jid = true
   }
+  params.muc_nickname_from_jid = true // if nickname already used, ConverseJS will add a suffix.
   // We dont need the keepalive. And I suppose it is related to some bugs when opening a previous chat window.
   params.keepalive = false
   // FIXME: use params.oauth_providers?