diff --git a/addons/point_of_sale/static/src/js/web_overrides/pos_config_form.js b/addons/point_of_sale/static/src/js/web_overrides/pos_config_form.js
new file mode 100644
index 00000000000..62cc162af21
--- /dev/null
+++ b/addons/point_of_sale/static/src/js/web_overrides/pos_config_form.js
@@ -0,0 +1,37 @@
+odoo.define('point_of_sale.pos_config_form', function (require) {
+    'use strict';
+
+    var FormController = require('web.FormController');
+    var FormView = require('web.FormView');
+    var viewRegistry = require('web.view_registry');
+
+    var PosConfigFormController = FormController.extend({
+        _enableButtons: function (changedFields) {
+            let shouldReload = false;
+            for (let field of changedFields) {
+                if (
+                    field.startsWith('module_') ||
+                    field.startsWith('group_') ||
+                    field === 'is_posbox'
+                ) {
+                    shouldReload = true;
+                    break;
+                }
+            }
+            if (shouldReload) {
+                window.location.reload();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        },
+    });
+
+    var PosConfigFormView = FormView.extend({
+        config: _.extend({}, FormView.prototype.config, {
+            Controller: PosConfigFormController,
+        }),
+    });
+
+    viewRegistry.add('pos_config_form', PosConfigFormView);
+    return FormView;
+});
diff --git a/addons/point_of_sale/views/pos_assets_common.xml b/addons/point_of_sale/views/pos_assets_common.xml
index 7b9683c0505..e33150b7040 100644
--- a/addons/point_of_sale/views/pos_assets_common.xml
+++ b/addons/point_of_sale/views/pos_assets_common.xml
@@ -112,6 +112,7 @@
         <script type="text/javascript" src="/point_of_sale/static/src/js/printers.js"></script>
         <script type="text/javascript" src="/point_of_sale/static/lib/html2canvas.js"></script>
         <script type="text/javascript" src="/point_of_sale/static/src/js/debug_manager.js"></script>
+        <script type="text/javascript" src="/point_of_sale/static/src/js/web_overrides/pos_config_form.js"></script>
     </xpath>
 </template>
 
diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml
index b8c27a75eda..0d7ab8e24ef 100644
--- a/addons/point_of_sale/views/pos_config_view.xml
+++ b/addons/point_of_sale/views/pos_config_view.xml
@@ -27,7 +27,7 @@
         <field name="name">pos.config.form.view</field>
         <field name="model">pos.config</field>
         <field name="arch" type="xml">
-            <form string="Point of Sale Configuration">
+            <form string="Point of Sale Configuration" js_class="pos_config_form">
                 <sheet>
                     <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <field name="active" invisible="1"/>
@@ -63,7 +63,11 @@
                         </div>
                         <div class="o_setting_right_pane">
                           <label for="module_pos_restaurant"/>
-                          <button string="Save" type="object" name="execute" class="oe_highlight" id="btn_use_pos_restaurant" attrs="{'invisible': [('module_pos_restaurant','=',False)]}" />
+                          <div class="content-group" id="warning_text_pos_restaurant" attrs="{'invisible': [('module_pos_restaurant','=',False)]}">
+                            <div class="text-warning mt16 mb4">
+                                Save this page and come back here to set up the feature.
+                            </div>
+                          </div>
                         </div>
                       </div>
                         <div class="col-12 col-lg-6 o_setting_box"
@@ -76,7 +80,11 @@
                                 <div class="text-muted">
                                     Use employee credentials to log in to the PoS session and switch cashier
                                 </div>
-                                <button string="Save" type="object" name="execute" class="oe_highlight" id="btn_use_employees" attrs="{'invisible': [('module_pos_hr','=',False)]}" />
+                                <div class="content-group" id="warning_text_employees" attrs="{'invisible': [('module_pos_hr','=',False)]}">
+                                    <div class="text-warning mt16 mb4">
+                                        Save this page and come back here to set up the feature.
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -331,9 +339,9 @@
                                 <div class="text-muted">
                                     Allow global discounts on orders
                                 </div>
-                                <div class="content-group " attrs="{'invisible':[('module_pos_discount','=',False)]}">
-                                    <div class="mt16" id="btn_use_pos_discount">
-                                        <button string="Save" type="object" name="execute" class="oe_highlight"/>
+                                <div class="content-group" id="warning_text_pos_discount" attrs="{'invisible':[('module_pos_discount','=',False)]}">
+                                    <div class="text-warning mt16 mb4">
+                                        Save this page and come back here to set up the feature.
                                     </div>
                                 </div>
                             </div>
@@ -359,8 +367,8 @@
                                     Give customer rewards, free samples, etc.
                                 </div>
                                 <div class="content-group" attrs="{'invisible': [('module_pos_loyalty', '=', False)]}">
-                                    <div class="mt16" id="btn_use_pos_loyalty">
-                                        <button string="Save" type="object" name="execute" class="oe_highlight"/>
+                                    <div class="text-warning mt16 mb4"  id="warning_text_pos_loyalty">
+                                        Save this page and come back here to set up the feature.
                                     </div>
                                 </div>
                             </div>
diff --git a/addons/pos_discount/views/pos_discount_views.xml b/addons/pos_discount/views/pos_discount_views.xml
index 0e38b16af64..a7839ca338f 100644
--- a/addons/pos_discount/views/pos_discount_views.xml
+++ b/addons/pos_discount/views/pos_discount_views.xml
@@ -5,7 +5,7 @@
             <field name="model">pos.config</field>
             <field name="inherit_id" ref="point_of_sale.pos_config_view_form" />
             <field name="arch" type="xml">
-                <div id="btn_use_pos_discount" position="replace">
+                <div id="warning_text_pos_discount" position="replace">
                     <div class="row mt16">
                         <label string="Discount Product" for="discount_product_id" class="col-lg-3 o_light_label"/>
                         <field name="discount_product_id" attrs="{'required':[('module_pos_discount','=',True)]}"/>
diff --git a/addons/pos_hr/views/pos_config.xml b/addons/pos_hr/views/pos_config.xml
index 668837c49ca..d5ca74a7f4c 100644
--- a/addons/pos_hr/views/pos_config.xml
+++ b/addons/pos_hr/views/pos_config.xml
@@ -5,7 +5,7 @@
         <field name="model">pos.config</field>
         <field name="inherit_id" ref="point_of_sale.pos_config_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//button[@id='btn_use_employees']" position='replace'>
+            <xpath expr="//div[@id='warning_text_employees']" position='replace'>
                 <div attrs="{'invisible': [('module_pos_hr', '=', False)]}">
                     <span class="o_form_label oe_edit_only">Allowed Employees </span>
                     <field name="employee_ids" widget="many2many_tags" 
diff --git a/addons/pos_restaurant/views/pos_config_views.xml b/addons/pos_restaurant/views/pos_config_views.xml
index 4bf03185ba4..fbeaa51f887 100644
--- a/addons/pos_restaurant/views/pos_config_views.xml
+++ b/addons/pos_restaurant/views/pos_config_views.xml
@@ -6,7 +6,7 @@
         <field name="model">pos.config</field>
         <field name="inherit_id" ref="point_of_sale.pos_config_view_form"/>
         <field name="arch" type="xml">
-            <button id="btn_use_pos_restaurant" position="replace"/>
+            <div id="warning_text_pos_restaurant" position="replace"/>
             <div id="iface_invoicing" position="before">
                 <div class="col-12 col-lg-6 o_setting_box"
                      id="iface_printbill"