diff --git a/pos_cashier_login/__init__.py b/pos_cashier_login/__init__.py
index e69de29b..6ac02ac2 100644
--- a/pos_cashier_login/__init__.py
+++ b/pos_cashier_login/__init__.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2019 by Lambda IS <https://www.lambda-is.com>
+
+from . import models
diff --git a/pos_cashier_login/__manifest__.py b/pos_cashier_login/__manifest__.py
index 2a3f3624..02756087 100755
--- a/pos_cashier_login/__manifest__.py
+++ b/pos_cashier_login/__manifest__.py
@@ -12,7 +12,8 @@
         'point_of_sale',
     ],
     'data': [
-        'views/main.xml',
+        'views/assets.xml',
+        'views/pos_config.xml',
     ],
     'qweb': [
         'static/src/xml/main.xml',
diff --git a/pos_cashier_login/models/__init__.py b/pos_cashier_login/models/__init__.py
new file mode 100644
index 00000000..ece5c988
--- /dev/null
+++ b/pos_cashier_login/models/__init__.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2019 by Lambda IS <https://www.lambda-is.com>
+
+from . import pos_config
diff --git a/pos_cashier_login/models/pos_config.py b/pos_cashier_login/models/pos_config.py
new file mode 100644
index 00000000..b8b09c43
--- /dev/null
+++ b/pos_cashier_login/models/pos_config.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2019 by Lambda IS <https://www.lambda-is.com>
+
+from odoo import fields, models
+
+
+class POSConfig(models.Model):
+    _inherit = 'pos.config'
+
+    require_cashier_login = fields.Boolean(
+        string='Cashier Login',
+        help='Require for cashier to be selected before each new sale')
diff --git a/pos_cashier_login/static/src/js/main.js b/pos_cashier_login/static/src/js/main.js
index 087b745d..cfff14a5 100755
--- a/pos_cashier_login/static/src/js/main.js
+++ b/pos_cashier_login/static/src/js/main.js
@@ -21,8 +21,10 @@ odoo.define('pos_cashier_login.main', function (require) {
     chrome.Chrome.include({
         build_widgets: function() {
             this._super();
-            this.gui.set_startup_screen('cashier-login');
-            this.gui.set_default_screen('cashier-login');
+            if (this.pos.config.require_cashier_login) {
+                this.gui.set_startup_screen('cashier-login');
+                this.gui.set_default_screen('cashier-login');
+            }
         },
     });
 
diff --git a/pos_cashier_login/views/main.xml b/pos_cashier_login/views/assets.xml
similarity index 84%
rename from pos_cashier_login/views/main.xml
rename to pos_cashier_login/views/assets.xml
index 50b1e693..4719f0f8 100644
--- a/pos_cashier_login/views/main.xml
+++ b/pos_cashier_login/views/assets.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 by Lambda IS <https://www.lambda-is.com> -->
 <odoo>
 
     <template id="assets" inherit_id="point_of_sale.assets">
diff --git a/pos_cashier_login/views/pos_config.xml b/pos_cashier_login/views/pos_config.xml
new file mode 100644
index 00000000..203b7e3a
--- /dev/null
+++ b/pos_cashier_login/views/pos_config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 by Lambda IS <https://www.lambda-is.com> -->
+<odoo>
+
+    <record id="view_pos_config_form" model="ir.ui.view">
+        <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="//div[@id='barcode_scanner']" position="after">
+                <div class="col-xs-12 col-md-6 o_setting_box">
+                    <div class="o_setting_left_pane">
+                        <field name="require_cashier_login"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="require_cashier_login" string="Cashier Login"/>
+                        <div class="text-muted">
+                            Require that the cashier is set (or scanned) before each new order.
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>