diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index e474ef3e83e..d74210125f3 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'CRM',
-    'version': '1.3',
+    'version': '1.4',
     'category': 'Sales/CRM',
     'sequence': 15,
     'summary': 'Track leads and close opportunities',
diff --git a/addons/crm/data/mail_data.xml b/addons/crm/data/mail_data.xml
index 9ad6c946d11..52f506f0503 100644
--- a/addons/crm/data/mail_data.xml
+++ b/addons/crm/data/mail_data.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
 <odoo>
     <data noupdate="1">
-        <!--default alias for leads-->
-        <record id="mail_alias_lead_info" model="mail.alias">
-            <field name="alias_name"></field>
-            <field name="alias_model_id" ref="model_crm_lead"/>
-            <field name="alias_user_id" ref="base.user_admin"/>
-            <field name="alias_parent_model_id" ref="model_crm_team"/>
-        </record>
-
         <!-- CRM-related subtypes for messaging / Chatter -->
         <record id="mt_lead_create" model="mail.message.subtype">
             <field name="name">Opportunity Created</field>
diff --git a/addons/crm/models/res_config_settings.py b/addons/crm/models/res_config_settings.py
index f01f8ea93c1..bccf20a322e 100644
--- a/addons/crm/models/res_config_settings.py
+++ b/addons/crm/models/res_config_settings.py
@@ -7,12 +7,6 @@ from odoo import api, fields, models
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    crm_alias_prefix = fields.Char(
-        'Default Alias Name for Leads',
-        compute="_compute_crm_alias_prefix" , readonly=False, store=True)
-    generate_lead_from_alias = fields.Boolean(
-        'Manual Assignment of Emails', config_parameter='crm.generate_lead_from_alias',
-        compute="_compute_generate_lead_from_alias", readonly=False, store=True)
     group_use_lead = fields.Boolean(string="Leads", implied_group='crm.group_use_lead')
     group_use_recurring_revenues = fields.Boolean(string="Recurring Revenues", implied_group='crm.group_use_recurring_revenues')
     module_crm_iap_lead = fields.Boolean("Generate new leads based on their country, industries, size, etc.")
@@ -29,18 +23,6 @@ class ResConfigSettings(models.TransientModel):
     predictive_lead_scoring_fields = fields.Many2many('crm.lead.scoring.frequency.field', string='Lead Scoring Frequency Fields', compute="_compute_pls_fields", inverse="_inverse_pls_fields_str")
     predictive_lead_scoring_fields_str = fields.Char(string='Lead Scoring Frequency Fields in String', config_parameter='crm.pls_fields')
 
-    def _find_default_lead_alias_id(self):
-        alias = self.env.ref('crm.mail_alias_lead_info', False)
-        if not alias:
-            alias = self.env['mail.alias'].search([
-                ('alias_model_id.model', '=', 'crm.lead'),
-                ('alias_force_thread_id', '=', False),
-                ('alias_parent_model_id.model', '=', 'crm.team'),
-                ('alias_parent_thread_id', '=', False),
-                ('alias_defaults', '=', '{}')
-            ], limit=1)
-        return alias
-
     @api.depends('predictive_lead_scoring_fields_str')
     def _compute_pls_fields(self):
         """ As config_parameters does not accept m2m field,
@@ -76,37 +58,8 @@ class ResConfigSettings(models.TransientModel):
             if setting.predictive_lead_scoring_start_date:
                 setting.predictive_lead_scoring_start_date_str = fields.Date.to_string(setting.predictive_lead_scoring_start_date)
 
-    @api.depends('group_use_lead')
-    def _compute_generate_lead_from_alias(self):
-        """ Reset alias / leads configuration if leads are not used """
-        for setting in self.filtered(lambda r: not r.group_use_lead):
-            setting.generate_lead_from_alias = False
-
-    @api.depends('generate_lead_from_alias')
-    def _compute_crm_alias_prefix(self):
-        for setting in self:
-            setting.crm_alias_prefix = (setting.crm_alias_prefix or 'contact') if setting.generate_lead_from_alias else False
-
-    @api.model
-    def get_values(self):
-        res = super(ResConfigSettings, self).get_values()
-        alias = self._find_default_lead_alias_id()
-        res.update(
-            crm_alias_prefix=alias.alias_name if alias else False,
-        )
-        return res
-
     def set_values(self):
         super(ResConfigSettings, self).set_values()
-        alias = self._find_default_lead_alias_id()
-        if alias:
-            alias.write({'alias_name': self.crm_alias_prefix})
-        else:
-            self.env['mail.alias'].create({
-                'alias_name': self.crm_alias_prefix,
-                'alias_model_id': self.env['ir.model']._get('crm.lead').id,
-                'alias_parent_model_id': self.env['ir.model']._get('crm.team').id,
-            })
         for team in self.env['crm.team'].search([]):
             team.alias_id.write(team._alias_get_creation_values())
 
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 7d38c8846d2..d5a8a937bad 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -66,32 +66,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-lg-6 o_setting_box" id="crm_lead"
-                                attrs="{'invisible': [('group_use_lead','=',False)]}"
-                                title="Emails received to that address generate new leads not assigned to any Sales Team yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific Sales Teams. To do so, set an email alias on the Sales Team.">
-                            <div class="o_setting_left_pane">
-                                <field name="generate_lead_from_alias"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="generate_lead_from_alias" string="Incoming Emails"/>
-                                <div class="text-muted">
-                                    Create leads from incoming emails
-                                </div>
-                                <div class="content-group" attrs="{'invisible': [('generate_lead_from_alias','=',False)]}">
-                                    <div class="mt16">
-                                        <field name="crm_alias_prefix" class="oe_inline"
-                                            attrs="{'required': [('generate_lead_from_alias', '=', True)]}"/>
-                                        <label class="mr-0" for="alias_domain" string="@"/>
-                                        <field name="alias_domain" readonly="1" force_save="1" class="oe_inline"/>
-                                    </div>
-                                    <div attrs="{'invisible': [('alias_domain', 'not in', ['localhost', '', False])]}">
-                                        <button type="action"
-                                            name="base_setup.action_general_configuration"
-                                            string="Use an External Email Server" icon="fa-arrow-right" class="oe_link"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                     </div>
                     <h2>Lead Generation</h2>
                     <div class="row mt16 o_settings_container" name="convert_visitor_setting_container">