2 files changed, 13 insertions, 0 deletions

diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index b58dcc0d6..7a081af33 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -70,6 +70,12 @@ const usersRegisterValidator = [
           .end()
       }
 
+      if (body.channel.name === body.username) {
+        return res.status(400)
+                  .send({ error: 'Channel name cannot be the same than user username.' })
+                  .end()
+      }
+
       const existing = await ActorModel.loadLocalByName(body.channel.name)
       if (existing) {
         return res.status(409)
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index d26032ea5..95097817b 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -737,6 +737,13 @@ describe('Test users API validators', function () {
       await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields })
     })
 
+    it('Should fail with a channel name that is the same than user username', async function () {
+      const source = { username: 'super_user', channel: { name: 'super_user', displayName: 'display name' } }
+      const fields = immutableAssign(baseCorrectParams, source)
+
+      await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields })
+    })
+
     it('Should fail with an existing channel', async function () {
       const videoChannelAttributesArg = { name: 'existing_channel', displayName: 'hello', description: 'super description' }
       await addVideoChannel(server.url, server.accessToken, videoChannelAttributesArg)