diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py
index 96e2c1d7efd..8c341467354 100644
--- a/addons/website_hr_recruitment/models/hr_job.py
+++ b/addons/website_hr_recruitment/models/hr_job.py
@@ -10,3 +10,12 @@ class hr_job(osv.osv):
         'website_published': fields.boolean('Available in the website'),
         'website_description': fields.html('Description for the website'),
     }
+
+    def _check_address_id_published(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            if obj.website_published and obj.address_id and not obj.address_id.website_published:
+                return False
+        return True
+    _constraints = [
+        (_check_address_id_published, "This Jobpost can't be published if the field Job Location is not website published.", ['address_id','website_published']),
+    ]
\ No newline at end of file
diff --git a/addons/website_partner/__openerp__.py b/addons/website_partner/__openerp__.py
index be318efa541..fa113ba3a44 100644
--- a/addons/website_partner/__openerp__.py
+++ b/addons/website_partner/__openerp__.py
@@ -31,6 +31,7 @@
         'views/res_partner_view.xml',
         'views/website_partner_view.xml',
         'security/website_partner_security.xml',
+        'data/website_data.xml',
     ],
     'css': [
     ],
diff --git a/addons/website_partner/data/website_data.xml b/addons/website_partner/data/website_data.xml
new file mode 100644
index 00000000000..dbb20996241
--- /dev/null
+++ b/addons/website_partner/data/website_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="base.main_company" model="res.company">
+            <field name="website_published">True</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/website_partner/models/__init__.py b/addons/website_partner/models/__init__.py
index f6dfb12ddc8..22f0f772809 100644
--- a/addons/website_partner/models/__init__.py
+++ b/addons/website_partner/models/__init__.py
@@ -1 +1,2 @@
-import res_partner
\ No newline at end of file
+import res_partner
+import res_company
\ No newline at end of file
diff --git a/addons/website_partner/models/res_company.py b/addons/website_partner/models/res_company.py
new file mode 100644
index 00000000000..c514be0fe65
--- /dev/null
+++ b/addons/website_partner/models/res_company.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv, fields
+
+
+class WebsiteResCompany(osv.Model):
+    _inherit = 'res.company'
+
+    _columns = {
+        'website_published': fields.related('partner_id', 'website_published', string='Publish', help="Publish on the website"),
+    }