diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
deleted file mode 100644
index d21e7220989..00000000000
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="portal_project_issue_kanban_view" model="ir.ui.view">
-            <field name="name">Project Issue Kanban</field>
-            <field name="model">project.issue</field>
-            <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <kanban class="oe_portal_project_issue">
-                    <field name="user_email"/>
-                    <field name="user_id"/>
-                    <field name="date_deadline"/>
-                    <field name="create_date"/>
-                    <field name="categ_ids"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div class="oe_kanban_card oe_kanban_global_click">
-                                <div class="oe_kanban_content">
-                                    <div class="oe_portal_project_issue">
-                                        <div><h1><field name="name"/></h1></div>
-                                        <div class="oe_kanban_footer_left">
-                                            <field name="partner_id" context="{'portal':1}"/> <br/>
-                                            <field name="version_id"/>                                            
-                                        </div>
-                                        <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
-                                        <div class="oe_text_right">
-                                            <h1><field name="stage_id" readonly="1"/></h1>
-                                        </div>
-                                    </div>
-                                    <div>
-                                        <h1><a type="open"><field name="name"/></a></h1>
-                                        <field name="partner_id"/> <br/>
-                                        <field name="version_id"/>
-                                    </div>
-                                    <div class="oe_kanban_footer_left">
-                                        <field name="categ_ids"/>
-                                        <div class="oe_right">
-                                            Creation: <field name="create_date"/>
-                                            <field name="priority" widget="priority"/>
-                                            <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())">
-                                                <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span>
-                                            </t>
-                                            <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="oe_clear"/>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="project_issue_categ_act0" model="ir.actions.act_window">
-            <field name="name">Issues</field>
-            <field name="res_model">project.issue</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">kanban,form</field>
-            <field name="view_id" ref="portal_project_issue_kanban_view"/>
-            <field name="domain" eval=""/>
-            <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":'', "portal":'True'}</field>
-            <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>
-            <field name="target">current</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create an issue.
-              </p><p>
-                You can track your issues from this menu and the action we
-                will take.
-              </p>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/portal_claim/__init__.py b/addons/website_crm_claim/__init__.py
similarity index 100%
rename from addons/portal_claim/__init__.py
rename to addons/website_crm_claim/__init__.py
diff --git a/addons/portal_claim/__openerp__.py b/addons/website_crm_claim/__openerp__.py
similarity index 91%
rename from addons/portal_claim/__openerp__.py
rename to addons/website_crm_claim/__openerp__.py
index 7f467d17c3c..89220692acb 100644
--- a/addons/portal_claim/__openerp__.py
+++ b/addons/website_crm_claim/__openerp__.py
@@ -21,8 +21,8 @@
 
 
 {
-    'name': 'Portal Claim',
-    'version': '0.1',
+    'name': 'Website CRM Claim',
+    'version': '0.2',
     'category': 'Tools',
     'complexity': 'easy',
     'description': """
@@ -30,9 +30,10 @@ This module adds claim menu and features to your portal if claim and portal are
 ==========================================================================================
     """,
     'author': 'OpenERP SA',
-    'depends': ['crm_claim','portal'],
+    'depends': ['crm_claim','portal', 'website'],
     'data': [
         'portal_claim_view.xml',
+        'website_claim_view.xml',
         'security/ir.model.access.csv',
         'security/portal_security.xml',
     ],
diff --git a/addons/portal_claim/i18n/ar.po b/addons/website_crm_claim/i18n/ar.po
similarity index 100%
rename from addons/portal_claim/i18n/ar.po
rename to addons/website_crm_claim/i18n/ar.po
diff --git a/addons/portal_claim/i18n/cs.po b/addons/website_crm_claim/i18n/cs.po
similarity index 100%
rename from addons/portal_claim/i18n/cs.po
rename to addons/website_crm_claim/i18n/cs.po
diff --git a/addons/portal_claim/i18n/de.po b/addons/website_crm_claim/i18n/de.po
similarity index 100%
rename from addons/portal_claim/i18n/de.po
rename to addons/website_crm_claim/i18n/de.po
diff --git a/addons/portal_claim/i18n/en_GB.po b/addons/website_crm_claim/i18n/en_GB.po
similarity index 100%
rename from addons/portal_claim/i18n/en_GB.po
rename to addons/website_crm_claim/i18n/en_GB.po
diff --git a/addons/portal_claim/i18n/es.po b/addons/website_crm_claim/i18n/es.po
similarity index 100%
rename from addons/portal_claim/i18n/es.po
rename to addons/website_crm_claim/i18n/es.po
diff --git a/addons/portal_claim/i18n/es_AR.po b/addons/website_crm_claim/i18n/es_AR.po
similarity index 100%
rename from addons/portal_claim/i18n/es_AR.po
rename to addons/website_crm_claim/i18n/es_AR.po
diff --git a/addons/portal_claim/i18n/fi.po b/addons/website_crm_claim/i18n/fi.po
similarity index 100%
rename from addons/portal_claim/i18n/fi.po
rename to addons/website_crm_claim/i18n/fi.po
diff --git a/addons/portal_claim/i18n/fr.po b/addons/website_crm_claim/i18n/fr.po
similarity index 100%
rename from addons/portal_claim/i18n/fr.po
rename to addons/website_crm_claim/i18n/fr.po
diff --git a/addons/portal_claim/i18n/hr.po b/addons/website_crm_claim/i18n/hr.po
similarity index 100%
rename from addons/portal_claim/i18n/hr.po
rename to addons/website_crm_claim/i18n/hr.po
diff --git a/addons/portal_claim/i18n/hu.po b/addons/website_crm_claim/i18n/hu.po
similarity index 100%
rename from addons/portal_claim/i18n/hu.po
rename to addons/website_crm_claim/i18n/hu.po
diff --git a/addons/portal_claim/i18n/it.po b/addons/website_crm_claim/i18n/it.po
similarity index 100%
rename from addons/portal_claim/i18n/it.po
rename to addons/website_crm_claim/i18n/it.po
diff --git a/addons/portal_claim/i18n/mk.po b/addons/website_crm_claim/i18n/mk.po
similarity index 100%
rename from addons/portal_claim/i18n/mk.po
rename to addons/website_crm_claim/i18n/mk.po
diff --git a/addons/portal_claim/i18n/nl.po b/addons/website_crm_claim/i18n/nl.po
similarity index 100%
rename from addons/portal_claim/i18n/nl.po
rename to addons/website_crm_claim/i18n/nl.po
diff --git a/addons/portal_claim/i18n/pl.po b/addons/website_crm_claim/i18n/pl.po
similarity index 100%
rename from addons/portal_claim/i18n/pl.po
rename to addons/website_crm_claim/i18n/pl.po
diff --git a/addons/portal_claim/i18n/portal_claim.pot b/addons/website_crm_claim/i18n/portal_claim.pot
similarity index 100%
rename from addons/portal_claim/i18n/portal_claim.pot
rename to addons/website_crm_claim/i18n/portal_claim.pot
diff --git a/addons/portal_claim/i18n/pt.po b/addons/website_crm_claim/i18n/pt.po
similarity index 100%
rename from addons/portal_claim/i18n/pt.po
rename to addons/website_crm_claim/i18n/pt.po
diff --git a/addons/portal_claim/i18n/pt_BR.po b/addons/website_crm_claim/i18n/pt_BR.po
similarity index 100%
rename from addons/portal_claim/i18n/pt_BR.po
rename to addons/website_crm_claim/i18n/pt_BR.po
diff --git a/addons/portal_claim/i18n/ro.po b/addons/website_crm_claim/i18n/ro.po
similarity index 100%
rename from addons/portal_claim/i18n/ro.po
rename to addons/website_crm_claim/i18n/ro.po
diff --git a/addons/portal_claim/i18n/sl.po b/addons/website_crm_claim/i18n/sl.po
similarity index 100%
rename from addons/portal_claim/i18n/sl.po
rename to addons/website_crm_claim/i18n/sl.po
diff --git a/addons/portal_claim/i18n/tr.po b/addons/website_crm_claim/i18n/tr.po
similarity index 100%
rename from addons/portal_claim/i18n/tr.po
rename to addons/website_crm_claim/i18n/tr.po
diff --git a/addons/portal_claim/i18n/zh_CN.po b/addons/website_crm_claim/i18n/zh_CN.po
similarity index 100%
rename from addons/portal_claim/i18n/zh_CN.po
rename to addons/website_crm_claim/i18n/zh_CN.po
diff --git a/addons/portal_claim/portal_claim.py b/addons/website_crm_claim/portal_claim.py
similarity index 100%
rename from addons/portal_claim/portal_claim.py
rename to addons/website_crm_claim/portal_claim.py
diff --git a/addons/portal_claim/portal_claim_view.xml b/addons/website_crm_claim/portal_claim_view.xml
similarity index 100%
rename from addons/portal_claim/portal_claim_view.xml
rename to addons/website_crm_claim/portal_claim_view.xml
diff --git a/addons/portal_claim/security/ir.model.access.csv b/addons/website_crm_claim/security/ir.model.access.csv
similarity index 100%
rename from addons/portal_claim/security/ir.model.access.csv
rename to addons/website_crm_claim/security/ir.model.access.csv
diff --git a/addons/portal_claim/security/portal_security.xml b/addons/website_crm_claim/security/portal_security.xml
similarity index 100%
rename from addons/portal_claim/security/portal_security.xml
rename to addons/website_crm_claim/security/portal_security.xml
diff --git a/addons/website_crm_claim/website_claim_view.xml b/addons/website_crm_claim/website_claim_view.xml
new file mode 100644
index 00000000000..cf0e2f25852
--- /dev/null
+++ b/addons/website_crm_claim/website_claim_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="website_crm_claim.link_claims" name="Claims Link from User Account" inherit_id="website.layout" groups="base.group_portal">
+        <xpath expr="//li[@class='dropdown']/ul/li[contains(.,'Logout')]" position="before">
+            <li><a href="/web#action=website_crm_claim.crm_claim_category_claim0" role="menuitem">Claims</a></li>
+        </xpath>
+    </template>
+
+</odoo>
+        
\ No newline at end of file
diff --git a/addons/portal_project_issue/__init__.py b/addons/website_project_issue/__init__.py
similarity index 100%
rename from addons/portal_project_issue/__init__.py
rename to addons/website_project_issue/__init__.py
diff --git a/addons/portal_project_issue/__openerp__.py b/addons/website_project_issue/__openerp__.py
similarity index 92%
rename from addons/portal_project_issue/__openerp__.py
rename to addons/website_project_issue/__openerp__.py
index aef35ca4860..2d39b18e5e2 100644
--- a/addons/portal_project_issue/__openerp__.py
+++ b/addons/website_project_issue/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Portal Issue',
+    'name': 'Website Project Issue',
     'version': '0.1',
     'category': 'Tools',
     'complexity': 'easy',
@@ -30,11 +30,12 @@ This module adds issue menu and features to your portal if project_issue and por
 ==================================================================================================
     """,
     'author': 'OpenERP SA',
-    'depends': ['project_issue','portal'],
+    'depends': ['project_issue','portal', 'website'],
     'data': [
         'security/portal_security.xml',
         'security/ir.model.access.csv',
         'portal_project_issue_view.xml',
+        'website_project_issue_view.xml',
         'views/portal_project_issue.xml',
     ],
     'installable': True,
diff --git a/addons/portal_project_issue/i18n/ar.po b/addons/website_project_issue/i18n/ar.po
similarity index 100%
rename from addons/portal_project_issue/i18n/ar.po
rename to addons/website_project_issue/i18n/ar.po
diff --git a/addons/portal_project_issue/i18n/cs.po b/addons/website_project_issue/i18n/cs.po
similarity index 100%
rename from addons/portal_project_issue/i18n/cs.po
rename to addons/website_project_issue/i18n/cs.po
diff --git a/addons/portal_project_issue/i18n/de.po b/addons/website_project_issue/i18n/de.po
similarity index 100%
rename from addons/portal_project_issue/i18n/de.po
rename to addons/website_project_issue/i18n/de.po
diff --git a/addons/portal_project_issue/i18n/en_GB.po b/addons/website_project_issue/i18n/en_GB.po
similarity index 100%
rename from addons/portal_project_issue/i18n/en_GB.po
rename to addons/website_project_issue/i18n/en_GB.po
diff --git a/addons/portal_project_issue/i18n/es.po b/addons/website_project_issue/i18n/es.po
similarity index 100%
rename from addons/portal_project_issue/i18n/es.po
rename to addons/website_project_issue/i18n/es.po
diff --git a/addons/portal_project_issue/i18n/es_AR.po b/addons/website_project_issue/i18n/es_AR.po
similarity index 100%
rename from addons/portal_project_issue/i18n/es_AR.po
rename to addons/website_project_issue/i18n/es_AR.po
diff --git a/addons/portal_project_issue/i18n/fi.po b/addons/website_project_issue/i18n/fi.po
similarity index 100%
rename from addons/portal_project_issue/i18n/fi.po
rename to addons/website_project_issue/i18n/fi.po
diff --git a/addons/portal_project_issue/i18n/fr.po b/addons/website_project_issue/i18n/fr.po
similarity index 100%
rename from addons/portal_project_issue/i18n/fr.po
rename to addons/website_project_issue/i18n/fr.po
diff --git a/addons/portal_project_issue/i18n/he.po b/addons/website_project_issue/i18n/he.po
similarity index 100%
rename from addons/portal_project_issue/i18n/he.po
rename to addons/website_project_issue/i18n/he.po
diff --git a/addons/portal_project_issue/i18n/hr.po b/addons/website_project_issue/i18n/hr.po
similarity index 100%
rename from addons/portal_project_issue/i18n/hr.po
rename to addons/website_project_issue/i18n/hr.po
diff --git a/addons/portal_project_issue/i18n/hu.po b/addons/website_project_issue/i18n/hu.po
similarity index 100%
rename from addons/portal_project_issue/i18n/hu.po
rename to addons/website_project_issue/i18n/hu.po
diff --git a/addons/portal_project_issue/i18n/it.po b/addons/website_project_issue/i18n/it.po
similarity index 100%
rename from addons/portal_project_issue/i18n/it.po
rename to addons/website_project_issue/i18n/it.po
diff --git a/addons/portal_project_issue/i18n/mk.po b/addons/website_project_issue/i18n/mk.po
similarity index 100%
rename from addons/portal_project_issue/i18n/mk.po
rename to addons/website_project_issue/i18n/mk.po
diff --git a/addons/portal_project_issue/i18n/nl.po b/addons/website_project_issue/i18n/nl.po
similarity index 100%
rename from addons/portal_project_issue/i18n/nl.po
rename to addons/website_project_issue/i18n/nl.po
diff --git a/addons/portal_project_issue/i18n/pl.po b/addons/website_project_issue/i18n/pl.po
similarity index 100%
rename from addons/portal_project_issue/i18n/pl.po
rename to addons/website_project_issue/i18n/pl.po
diff --git a/addons/portal_project_issue/i18n/portal_project_issue.pot b/addons/website_project_issue/i18n/portal_project_issue.pot
similarity index 100%
rename from addons/portal_project_issue/i18n/portal_project_issue.pot
rename to addons/website_project_issue/i18n/portal_project_issue.pot
diff --git a/addons/portal_project_issue/i18n/pt.po b/addons/website_project_issue/i18n/pt.po
similarity index 100%
rename from addons/portal_project_issue/i18n/pt.po
rename to addons/website_project_issue/i18n/pt.po
diff --git a/addons/portal_project_issue/i18n/pt_BR.po b/addons/website_project_issue/i18n/pt_BR.po
similarity index 100%
rename from addons/portal_project_issue/i18n/pt_BR.po
rename to addons/website_project_issue/i18n/pt_BR.po
diff --git a/addons/portal_project_issue/i18n/ro.po b/addons/website_project_issue/i18n/ro.po
similarity index 100%
rename from addons/portal_project_issue/i18n/ro.po
rename to addons/website_project_issue/i18n/ro.po
diff --git a/addons/portal_project_issue/i18n/ru.po b/addons/website_project_issue/i18n/ru.po
similarity index 100%
rename from addons/portal_project_issue/i18n/ru.po
rename to addons/website_project_issue/i18n/ru.po
diff --git a/addons/portal_project_issue/i18n/sl.po b/addons/website_project_issue/i18n/sl.po
similarity index 100%
rename from addons/portal_project_issue/i18n/sl.po
rename to addons/website_project_issue/i18n/sl.po
diff --git a/addons/portal_project_issue/i18n/sv.po b/addons/website_project_issue/i18n/sv.po
similarity index 100%
rename from addons/portal_project_issue/i18n/sv.po
rename to addons/website_project_issue/i18n/sv.po
diff --git a/addons/portal_project_issue/i18n/tr.po b/addons/website_project_issue/i18n/tr.po
similarity index 100%
rename from addons/portal_project_issue/i18n/tr.po
rename to addons/website_project_issue/i18n/tr.po
diff --git a/addons/portal_project_issue/i18n/zh_CN.po b/addons/website_project_issue/i18n/zh_CN.po
similarity index 100%
rename from addons/portal_project_issue/i18n/zh_CN.po
rename to addons/website_project_issue/i18n/zh_CN.po
diff --git a/addons/website_project_issue/portal_project_issue_view.xml b/addons/website_project_issue/portal_project_issue_view.xml
new file mode 100644
index 00000000000..b461c09c070
--- /dev/null
+++ b/addons/website_project_issue/portal_project_issue_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="open_view_issue" model="ir.actions.act_window">
+            <field name="name">Issues</field>
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="project_issue.project_issue_tree_view"/>
+            <field name="domain" eval=""/>
+            <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":'', "portal":'True'}</field>
+            <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>
+            <field name="target">current</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create an issue.
+              </p><p>
+                You can track your issues from this menu and the action we
+                will take.
+              </p>
+            </field>
+        </record>
+
+        <menuitem name="Issues" id="portal_services_issues" parent="portal.portal_projects"
+            action="open_view_issue" sequence="10"/>
+
+    </data>
+</openerp>
diff --git a/addons/portal_project_issue/security/ir.model.access.csv b/addons/website_project_issue/security/ir.model.access.csv
similarity index 100%
rename from addons/portal_project_issue/security/ir.model.access.csv
rename to addons/website_project_issue/security/ir.model.access.csv
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/website_project_issue/security/portal_security.xml
similarity index 100%
rename from addons/portal_project_issue/security/portal_security.xml
rename to addons/website_project_issue/security/portal_security.xml
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/website_project_issue/static/src/css/portal_project_issue.css
similarity index 100%
rename from addons/portal_project_issue/static/src/css/portal_project_issue.css
rename to addons/website_project_issue/static/src/css/portal_project_issue.css
diff --git a/addons/portal_project_issue/tests/__init__.py b/addons/website_project_issue/tests/__init__.py
similarity index 100%
rename from addons/portal_project_issue/tests/__init__.py
rename to addons/website_project_issue/tests/__init__.py
diff --git a/addons/portal_project_issue/tests/test_access_rights.py b/addons/website_project_issue/tests/test_access_rights.py
similarity index 100%
rename from addons/portal_project_issue/tests/test_access_rights.py
rename to addons/website_project_issue/tests/test_access_rights.py
diff --git a/addons/portal_project_issue/views/portal_project_issue.xml b/addons/website_project_issue/views/portal_project_issue.xml
similarity index 71%
rename from addons/portal_project_issue/views/portal_project_issue.xml
rename to addons/website_project_issue/views/portal_project_issue.xml
index 722630ea49a..3b470cc253b 100644
--- a/addons/portal_project_issue/views/portal_project_issue.xml
+++ b/addons/website_project_issue/views/portal_project_issue.xml
@@ -3,7 +3,7 @@
     <data>
         <template id="assets_backend" name="portal_project_issue assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/portal_project_issue/static/src/css/portal_project_issue.css"/>
+                <link rel="stylesheet" href="/website_project_issue/static/src/css/portal_project_issue.css"/>
             </xpath>
         </template>
     </data>
diff --git a/addons/website_project_issue/website_project_issue_view.xml b/addons/website_project_issue/website_project_issue_view.xml
new file mode 100644
index 00000000000..e45ed420d88
--- /dev/null
+++ b/addons/website_project_issue/website_project_issue_view.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="website_project_issue.link_issues" name="Issues Link from User Account" inherit_id="website.layout" groups="base.group_portal">
+        <xpath expr="//li[@class='dropdown']/ul/li[contains(.,'Logout')]" position="before">
+            <li><a href="/web#action=website_project_issue.open_view_issue" role="menuitem">Issues</a></li>
+        </xpath>
+    </template>
+</odoo>
+        
\ No newline at end of file