diff --git a/addons/website/models/res_partner.py b/addons/website/models/res_partner.py
index 45d65919cd9..9256f80293d 100644
--- a/addons/website/models/res_partner.py
+++ b/addons/website/models/res_partner.py
@@ -3,7 +3,7 @@
 
 import werkzeug
 
-from odoo import api, fields, models
+from odoo import api, models
 
 
 def urlplus(url, params):
@@ -11,9 +11,8 @@ def urlplus(url, params):
 
 
 class Partner(models.Model):
-    _inherit = "res.partner"
-
-    website_id = fields.Many2one('website', string='Registration Website')
+    _name = 'res.partner'
+    _inherit = ['res.partner', 'website.published.multi.mixin']
 
     @api.multi
     def google_map_img(self, zoom=8, width=298, height=298):
diff --git a/addons/website_partner/models/res_partner.py b/addons/website_partner/models/res_partner.py
index c11922a5833..5c49c3344bc 100644
--- a/addons/website_partner/models/res_partner.py
+++ b/addons/website_partner/models/res_partner.py
@@ -6,7 +6,7 @@ from odoo.addons.http_routing.models.ir_http import slug
 
 class WebsiteResPartner(models.Model):
     _name = 'res.partner'
-    _inherit = ['res.partner', 'website.seo.metadata', 'website.published.mixin']
+    _inherit = ['res.partner', 'website.seo.metadata']
 
     website_description = fields.Html('Website Partner Full Description', strip_style=True)
     website_short_description = fields.Text('Website Partner Short Description')
diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py
index 5868209f38d..7c8bd126184 100644
--- a/odoo/addons/base/models/res_partner.py
+++ b/odoo/addons/base/models/res_partner.py
@@ -163,7 +163,7 @@ class Partner(models.Model):
       help='The internal user in charge of this contact.')
     vat = fields.Char(string='Tax ID', help="The Tax Identification Number. Complete it if the contact is subjected to government taxes. Used in some legal statements.")
     bank_ids = fields.One2many('res.partner.bank', 'partner_id', string='Banks')
-    website = fields.Char()
+    website = fields.Char('Website Link')
     comment = fields.Text(string='Notes')
 
     category_id = fields.Many2many('res.partner.category', column1='partner_id',