diff --git a/dbfilter_from_header/README.rst b/dbfilter_from_header/README.rst
index 5107a5b2c..03293e46b 100644
--- a/dbfilter_from_header/README.rst
+++ b/dbfilter_from_header/README.rst
@@ -19,7 +19,7 @@ a server-wide module.
 This can be done with the ``load`` parameter in ``/etc/odoo.conf`` or with the
 ``--load`` command-line parameter
 
-``load = "web, web_kanban, dbfilter_from_header"``
+``load = "web, dbfilter_from_header"``
 
 Configuration
 =============
@@ -62,6 +62,7 @@ Contributors
 * Sandy Carter <sandy.carter@savoirfairelinux.com>
 * Fabio Vilchez <fabio.vilchez@clearcorp.co.cr>
 * Jos De Graeve <Jos.DeGraeve@apertoso.be>
+* Lai Tim Siu (Quaritle Limited) <info@quartile.co>
 
 Maintainer
 ----------
diff --git a/dbfilter_from_header/__init__.py b/dbfilter_from_header/__init__.py
index 4d7ba003e..b57de876a 100644
--- a/dbfilter_from_header/__init__.py
+++ b/dbfilter_from_header/__init__.py
@@ -1,20 +1,2 @@
-# -*- coding: utf-8 -*-
-# © 2013  Therp BV
-# © 2014  ACSONE SA/NV
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-import re
-from odoo import http
-
-db_filter_org = http.db_filter
-
-
-def db_filter(dbs, httprequest=None):
-    dbs = db_filter_org(dbs, httprequest)
-    httprequest = httprequest or http.request.httprequest
-    db_filter_hdr = httprequest.environ.get('HTTP_X_ODOO_DBFILTER')
-    if db_filter_hdr:
-        dbs = [db for db in dbs if re.match(db_filter_hdr, db)]
-    return dbs
-
-http.db_filter = db_filter
+from . import override
diff --git a/dbfilter_from_header/__manifest__.py b/dbfilter_from_header/__manifest__.py
index 24bb1733a..835579122 100644
--- a/dbfilter_from_header/__manifest__.py
+++ b/dbfilter_from_header/__manifest__.py
@@ -1,12 +1,12 @@
-# -*- coding: utf-8 -*-
 # © 2013  Therp BV
 # © 2014  ACSONE SA/NV
+# Copyright 2018 Quartile Limited
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
     "name": "dbfilter_from_header",
     "summary": "Filter databases with HTTP headers",
-    "version": "10.0.1.0.0",
+    "version": "11.0.1.0.0",
     "author": "Therp BV,Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "complexity": "normal",
diff --git a/dbfilter_from_header/i18n/dbfilter_from_header.pot b/dbfilter_from_header/i18n/dbfilter_from_header.pot
index 3c201b4a8..447d3bb3c 100644
--- a/dbfilter_from_header/i18n/dbfilter_from_header.pot
+++ b/dbfilter_from_header/i18n/dbfilter_from_header.pot
@@ -1,12 +1,10 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 17:40+0000\n"
-"PO-Revision-Date: 2014-03-14 17:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/dbfilter_from_header/override.py b/dbfilter_from_header/override.py
new file mode 100644
index 000000000..a347c30ed
--- /dev/null
+++ b/dbfilter_from_header/override.py
@@ -0,0 +1,21 @@
+# © 2013  Therp BV
+# © 2014  ACSONE SA/NV
+# Copyright 2018 Quartile Limited
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+import re
+from odoo import http
+
+db_filter_org = http.db_filter
+
+
+def db_filter(dbs, httprequest=None):
+    dbs = db_filter_org(dbs, httprequest)
+    httprequest = httprequest or http.request.httprequest
+    db_filter_hdr = httprequest.environ.get('HTTP_X_ODOO_DBFILTER')
+    if db_filter_hdr:
+        dbs = [db for db in dbs if re.match(db_filter_hdr, db)]
+    return dbs
+
+
+http.db_filter = db_filter