diff --git a/addons/website_links/__init__.py b/addons/website_links/__init__.py
index 65d7531a..59ba9124 100644
--- a/addons/website_links/__init__.py
+++ b/addons/website_links/__init__.py
@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
 from . import controller
+from . import models
diff --git a/addons/website_links/__manifest__.py b/addons/website_links/__manifest__.py
index d6a0ba83..5b7aae66 100644
--- a/addons/website_links/__manifest__.py
+++ b/addons/website_links/__manifest__.py
@@ -10,6 +10,7 @@ Website interface to create short and trackable URLs.
     'version': '1.0',
     'depends': ['website', 'link_tracker'],
     'data': [
+        'views/link_tracker.xml',
         'views/website_links_template.xml',
         'views/website_links_graphs.xml',
         'security/ir.model.access.csv',
diff --git a/addons/website_links/models/__init__.py b/addons/website_links/models/__init__.py
new file mode 100644
index 00000000..895d0b60
--- /dev/null
+++ b/addons/website_links/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import link_tracker
diff --git a/addons/website_links/models/link_tracker.py b/addons/website_links/models/link_tracker.py
new file mode 100644
index 00000000..a7db389e
--- /dev/null
+++ b/addons/website_links/models/link_tracker.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+from flectra import models, fields, api, _
+
+
+class LinkTracker(models.Model):
+
+    _inherit = "link.tracker"
+
+    website_id = fields.Many2one('website', string="Link For Website",
+                                 required=True)
diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js
index 6a4bf876..8100f968 100644
--- a/addons/website_links/static/src/js/website_links.js
+++ b/addons/website_links/static/src/js/website_links.js
@@ -351,6 +351,7 @@ if (!$('.o_website_links_create_tracked_url').length) {
 
             var params = {};
             params.url = $("#url").val();
+            params.website_id = $("#website_id").val();
             if (campaign_id !== '') { params.campaign_id = parseInt(campaign_id); }
             if (medium_id !== '') { params.medium_id = parseInt(medium_id); }
             if (source_id !== '') { params.source_id = parseInt(source_id); }
diff --git a/addons/website_links/views/link_tracker.xml b/addons/website_links/views/link_tracker.xml
new file mode 100644
index 00000000..c73572bd
--- /dev/null
+++ b/addons/website_links/views/link_tracker.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<flectra>
+    <!-- Website links views -->
+    <record id="view_link_tracker_form_inherit" model="ir.ui.view">
+        <field name="name">link.tracker.form.inherit</field>
+        <field name="model">link.tracker</field>
+        <field name="inherit_id" ref="link_tracker.view_link_tracker_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='source_id']" position="after">
+                <field name="website_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_link_tracker_filter" model="ir.ui.view">
+        <field name="name">view.link.tracker.filter</field>
+        <field name="model">link.tracker</field>
+        <field name="arch" type="xml">
+            <search string="Search Link Tracker">
+                <separator/>
+                <filter name="website_id" string="Website"
+                        context="{'group_by':'website_id'}"/>
+            </search>
+        </field>
+    </record>
+
+     <!-- Action for website links-->
+    <record model="ir.actions.act_window" id="link_tracker.action_link_tracker">
+        <field name="name">Link Tracker</field>
+        <field name="res_model">link.tracker</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,graph</field>
+        <field name="search_view_id" ref="view_link_tracker_filter"/>
+    </record>
+</flectra>
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index 44ad0259..26edc9bb 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -79,6 +79,16 @@
                                         <span id="generated_tracked_link" style="display:none;" class="text-muted"></span>
                                     </div>
                                 </div>
+
+                                <div class="form-group" id="url-form-group">
+                                    <label class="col-sm-3 control-label text-left hidden">
+                                        Website
+                                    </label>
+
+                                    <div class="col-sm-9">
+                                        <input type="hidden" id="website_id" class="form-control" t-att-value="website.id"/>
+                                    </div>
+                                </div>
                             </form>
                         </div>