diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 19bd2c010c2..1a248849430 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -99,7 +99,7 @@ class PaymentAcquirer(osv.Model):
 
     _defaults = {
         'company_id': lambda self, cr, uid, obj, ctx=None: self.pool['res.users'].browse(cr, uid, uid).company_id.id,
-        'environment': 'test',
+        'environment': 'prod',
         'validation': 'manual',
         'website_published': False,
         'auto_confirm': 'at_pay_confirm',
@@ -335,7 +335,7 @@ class PaymentAcquirer(osv.Model):
 
     def render_payment_block(self, cr, uid, reference, amount, currency_id, tx_id=None, partner_id=False, partner_values=None, tx_values=None, company_id=None, context=None):
         html_forms = []
-        domain = [('website_published', '=', True), ('validation', '=', 'automatic')]
+        domain = [('validation', '=', 'automatic')]
         if company_id:
             domain.append(('company_id', '=', company_id))
         acquirer_ids = self.search(cr, uid, domain, context=context)
@@ -351,9 +351,6 @@ class PaymentAcquirer(osv.Model):
         html_block = '\n'.join(filter(None, html_forms))
         return self._wrap_payment_block(cr, uid, html_block, amount, currency_id, context=context)
 
-    def website_publish_button(self, cr, uid, ids, context=None):
-        for i in self.browse(cr, uid, ids, context=context):
-            i.website_published = not i.website_published
 
 class PaymentTransaction(osv.Model):
     """ Transaction Model. Each specific acquirer can extend the model by adding
diff --git a/addons/payment/views/payment_acquirer.xml b/addons/payment/views/payment_acquirer.xml
index 7498a63ccb0..8259ae05fff 100644
--- a/addons/payment/views/payment_acquirer.xml
+++ b/addons/payment/views/payment_acquirer.xml
@@ -15,11 +15,6 @@
             <field name="arch" type="xml">
                 <form string="Payment Acquirer">
                     <sheet>
-                        <div class="oe_button_box" name="button_box">
-                            <button class="oe_stat_button" name="website_publish_button" type="object" icon="fa-globe">
-                                <field name="website_published" widget="website_button"/>
-                            </button>
-                        </div>
                         <group name="acquirer_base">
                             <group name="acquirer_left">
                                 <field name="name"/>
@@ -91,7 +86,6 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="provider"/>
-                    <field name="website_published"/>
                     <field name="environment"/>
                 </tree>
             </field>
diff --git a/addons/website_payment/__openerp__.py b/addons/website_payment/__openerp__.py
index 4ce97436290..9e15a1cdd19 100644
--- a/addons/website_payment/__openerp__.py
+++ b/addons/website_payment/__openerp__.py
@@ -13,8 +13,8 @@
         'website_portal',
     ],
     'data': [
+        'views/website_payment_view.xml',
         'views/website_payment_templates.xml',
-        'views/website_settings_payment.xml',
     ],
     'auto_install': False,
 }
diff --git a/addons/website_payment/models/__init__.py b/addons/website_payment/models/__init__.py
index b8b239729b6..a6b2daed781 100644
--- a/addons/website_payment/models/__init__.py
+++ b/addons/website_payment/models/__init__.py
@@ -1 +1,2 @@
-import website
\ No newline at end of file
+import website
+import payment
diff --git a/addons/website_payment/models/payment.py b/addons/website_payment/models/payment.py
new file mode 100644
index 00000000000..1f6cdb992d2
--- /dev/null
+++ b/addons/website_payment/models/payment.py
@@ -0,0 +1,6 @@
+from openerp import models
+
+
+class PaymentAcquirer(models.Model):
+    _name = 'payment.acquirer'
+    _inherit = ['payment.acquirer','website.published.mixin']
diff --git a/addons/website_payment/views/website_payment_view.xml b/addons/website_payment/views/website_payment_view.xml
new file mode 100644
index 00000000000..eef9fdae2c6
--- /dev/null
+++ b/addons/website_payment/views/website_payment_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="website_settings_payment" model="ir.ui.view">
+            <field name="name">website.form</field>
+            <field name="model">website</field>
+            <field name="inherit_id" ref="website.view_website_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='other']" position='before'>
+                    <div name="shop">
+                        <separator string="E-Commerce"/>
+                        <group name="shop">
+                            <button type="action"
+                                    name="%(payment.action_payment_acquirer)d"
+                                    string="Configure payment acquirers" class="oe_link"/>
+                        </group>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="acquirer_form_published" model="ir.ui.view">
+            <field name="name">payment.acquirer.form.published</field>
+            <field name="model">payment.acquirer</field>
+            <field name="inherit_id" ref="payment.acquirer_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='acquirer_base']" position="before">
+                    <div class="oe_button_box" name="button_box">
+                        <button class="oe_stat_button" name="website_publish_button" type="object" icon="fa-globe">
+                            <field name="website_published" widget="website_button"/>
+                        </button>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="acquirer_list_published" model="ir.ui.view">
+            <field name="name">payment.acquirer.tree.published</field>
+            <field name="model">payment.acquirer</field>
+            <field name="inherit_id" ref="payment.acquirer_list"/>
+            <field name="arch" type="xml">
+                <field name="provider" position="after">
+                    <field name="website_published"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/website_payment/views/website_settings_payment.xml b/addons/website_payment/views/website_settings_payment.xml
deleted file mode 100644
index 513389fb7f0..00000000000
--- a/addons/website_payment/views/website_settings_payment.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="website_settings_payment" model="ir.ui.view">
-            <field name="name">website.form</field>
-            <field name="model">website</field>
-            <field name="inherit_id" ref="website.view_website_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='other']" position='before'>
-                    <div name="shop">
-                        <separator string="E-Commerce"/>
-                        <group name="shop">
-                            <button type="action"
-                                    name="%(payment.action_payment_acquirer)d"
-                                    string="Configure payment acquirers" class="oe_link"/>
-                        </group>
-                    </div>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 8ed8db8b402..186deb77698 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -10,7 +10,7 @@ OpenERP E-Commerce
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'sale', 'payment', 'website_portal'],
+    'depends': ['sale', 'website_payment', 'website_portal'],
     'data': [
         'data/data.xml',
         'data/web_planner_data.xml',