diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index 39bff49c77d..a5bb7374098 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -15,7 +15,12 @@ class ResConfigSettings(models.TransientModel):
     module_sale_margin = fields.Boolean("Margins")
     group_sale_layout = fields.Boolean("Sections on Sales Orders", implied_group='sale.group_sale_layout')
     group_warning_sale = fields.Boolean("Warnings", implied_group='sale.group_warning_sale')
-    module_website_quote = fields.Boolean("Online Quotations & Templates")
+    portal_confirmation = fields.Boolean('Online Signature & Payment')
+    portal_confirmation_options = fields.Selection([
+        ('sign', 'Signature'),
+        ('pay', 'Payment')], string="Online Signature & Payment options")
+    module_sale_payment = fields.Boolean("Online Signature & Payment", help='Technical field implied by user choice of online_confirmation')
+    module_website_quote = fields.Boolean("Quotations Templates")
     group_sale_delivery_address = fields.Boolean("Customer Addresses", implied_group='sale.group_delivery_invoice_address')
     multi_sales_price = fields.Boolean("Multiple sales price per product")
     multi_sales_price_method = fields.Selection([
@@ -113,11 +118,22 @@ class ResConfigSettings(models.TransientModel):
                 'group_pricelist_item': False,
             })
 
+    @api.onchange('portal_confirmation')
+    def _onchange_portal_confirmation(self):
+        if not self.portal_confirmation:
+            self.portal_confirmation_options = False
+
+    @api.onchange('portal_confirmation_options')
+    def _onchange_portal_confirmation_options(self):
+        if self.portal_confirmation_options == 'pay':
+            self.module_sale_payment = True
+
     @api.model
     def get_values(self):
         res = super(ResConfigSettings, self).get_values()
         ICPSudo = self.env['ir.config_parameter'].sudo()
         sale_pricelist_setting = ICPSudo.get_param('sale.sale_pricelist_setting')
+        sale_portal_confirmation_options = ICPSudo.get_param('sale.sale_portal_confirmation_options', default='none')
         res.update(
             auth_signup_uninvited='b2c' if ICPSudo.get_param('auth_signup.allow_uninvited', 'False').lower() == 'true' else 'b2b',
             use_sale_note=ICPSudo.get_param('sale.use_sale_note', default=False),
@@ -127,6 +143,8 @@ class ResConfigSettings(models.TransientModel):
             multi_sales_price=sale_pricelist_setting in ['percentage', 'formula'],
             multi_sales_price_method=sale_pricelist_setting in ['percentage', 'formula'] and sale_pricelist_setting or False,
             sale_pricelist_setting=sale_pricelist_setting,
+            portal_confirmation=sale_portal_confirmation_options in ('pay', 'sign'),
+            portal_confirmation_options=sale_portal_confirmation_options if sale_portal_confirmation_options in ('pay', 'sign') else False,
         )
         return res
 
@@ -140,3 +158,4 @@ class ResConfigSettings(models.TransientModel):
         ICPSudo.set_param("sale.default_deposit_product_id", self.default_deposit_product_id.id)
         ICPSudo.set_param('sale.sale_pricelist_setting', self.sale_pricelist_setting)
         ICPSudo.set_param('sale.sale_show_tax', self.sale_show_tax)
+        ICPSudo.set_param('sale.sale_portal_confirmation_options', self.portal_confirmation_options if self.portal_confirmation_options in ('pay', 'sign') else 'none')
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index dac061fc1e5..f81905fc693 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -154,14 +154,35 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box" id="sale_config_online_confirmation">
+                            <div class="o_setting_left_pane">
+                                <field name="portal_confirmation"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <field name="module_sale_payment" invisible="1"/>
+                                <label for="portal_confirmation"/>
+                                <div class="text-muted">
+                                    Let your customers sign &amp; pay online
+                                </div>
+                                <div class="content-group" attrs="{'invisible': [('portal_confirmation', '=', False)]}">
+                                    <div class="mt16">
+                                        <field name="portal_confirmation_options" widget="radio"
+                                            attrs="{'required': [('portal_confirmation', '=', True)]}"/>
+                                    </div>
+                                <div attrs="{'invisible': [('portal_confirmation_options', '!=', 'pay')]}">
+                                    <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Acquirers" class="btn-link"/>
+                                </div>
+                                </div>
+                            </div>
+                        </div>
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
                                 <field name="module_website_quote"/>
                             </div>
                             <div class="o_setting_right_pane">
                                 <label for="module_website_quote"/>
-                                <div class="text-muted" id="website_quote">
-                                    Let your customers sign &amp; pay online
+                                <div class="text-muted" id="sale_config_website_quote">
+                                    Design standardized offers
                                 </div>
                             </div>
                         </div>
diff --git a/addons/website_quote/views/res_config_settings_views.xml b/addons/website_quote/views/res_config_settings_views.xml
index 6af5203e6c2..c16cdabc055 100644
--- a/addons/website_quote/views/res_config_settings_views.xml
+++ b/addons/website_quote/views/res_config_settings_views.xml
@@ -6,18 +6,15 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="sale.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='website_quote']" position="after">
-                <div class="content-group">
-                    <div class="mt16" attrs="{'invisible': [('module_website_quote','=',False)]}">
+            <xpath expr="//div[@id='sale_config_website_quote']" position="after">
+                <div class="content-group" attrs="{'invisible': [('module_website_quote','=',False)]}">
+                    <div class="mt16">
                         <label for="default_template_id" class="o_light_label"/>
                         <field name="default_template_id" class="oe_inline"/>
                     </div>
-                    <div attrs="{'invisible': [('module_website_quote','=',False)]}">
+                    <div>
                         <button name="%(website_quote.action_sale_quotation_template)d" icon="fa-arrow-right" type="action" string="Quotation Templates" class="btn-link"/>
                     </div>
-                    <div attrs="{'invisible': [('module_website_quote','=',False)]}">
-                        <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Acquirers" class="btn-link"/>
-                    </div>
                  </div>
              </xpath>
         </field>