diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 42fe3a1df12..d2086c3689a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,11 +112,11 @@
                             </p>
                         </group>
                     </group>
-                    <group colspan="4">
+                    <group colspan="4" name="group_alias">
                         <label for="alias_id"/>
                         <div class="oe_inline">
                             <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                            <span class="oe_edit_only" name="edit_alias">
+                            <span class="oe_edit_only oe_edit_alias" name="edit_alias">
                                 <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
                             </span>
                          </div>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 84247a9fc52..2b990de8d64 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -65,6 +65,10 @@ class project_issue(base_stage, osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
+        if vals.get('use_issues') and not vals.get('use_tasks'):
+            vals['alias_model'] = 'project.issue'
+        elif not vals.get('use_issues') and vals.get('use_tasks'):
+            vals['alias_model'] = 'project.task'
         if not vals.get('stage_id'):
             ctx = context.copy()
             if vals.get('project_id'):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c6d23bfae6d..6547b3e3f69 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -334,9 +334,19 @@
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                 </field>
-                <xpath expr='//span[@name="edit_alias"]' position='after'>
-                    <label for="alias_model" string="creates" class="oe_inline"/>
-                    <field name="alias_model" class="oe_inline" widget="radio"/>
+                <xpath expr='//group[@name="group_alias"]' position='replace'>
+                    <group colspan="4" name="group_alias" attrs="{'invisible': [('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
+                        <label for="alias_id"/>
+                        <div class="oe_inline">
+                            <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                            <span class="oe_edit_only" style="vertical-align: middle;line-height: 21px;" name="edit_alias">
+                                <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
+                                <span attrs="{'invisible': ['|', ('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
+                                    creates <field name="alias_model" class="oe_inline" widget="radio"/>
+                                </span>
+                            </span>
+                         </div>
+                    </group>
                 </xpath>
             </field>
        </record>