diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 491784682f2..ea1929a1c13 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -153,6 +153,7 @@ and users by email"),
         'user_id': crm_case._get_default_user,
         'email_from': crm_case._get_default_email,
         'state': lambda *a: 'draft',
+        'type': lambda *a: 'lead',
         'section_id': crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 8fcd791144e..2164903b3c0 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -288,7 +288,7 @@
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
         <field name="domain">[('parent_id','child_of',active_id)]</field>
-        <field name="context">{'parent_id':'active_id'}</field>
+        <field name="context">{'parent_id':active_id}</field>
     </record>
 
     <record model="ir.values" id="ir_action_document_file_directory_form">