diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py
index c5b2d9bbec8..36acb6895bc 100644
--- a/addons/mail/models/res_users.py
+++ b/addons/mail/models/res_users.py
@@ -58,6 +58,8 @@ class Users(models.Model):
 
         # create a welcome message
         user._create_welcome_message()
+        # Auto-subscribe to channels
+        self.env['mail.channel'].search([('group_ids', 'in', user.groups_id.ids)])._subscribe_users()
         return user
 
     @api.multi