diff --git a/addons/hr_applicant_document/hr_applicant_document_view.xml b/addons/hr_applicant_document/hr_applicant_document_view.xml
index 277441d6d50..247c708a138 100644
--- a/addons/hr_applicant_document/hr_applicant_document_view.xml
+++ b/addons/hr_applicant_document/hr_applicant_document_view.xml
@@ -19,11 +19,6 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="document.view_document_file_tree"/>
             <field name="domain">[('res_model','=','hr.applicant')]</field>
-            <field name="help" type="html">
-            <p class="oe_view_nocontent_create">
-             Search through resumes and motivation letters.
-            </p>
-            </field>
         </record>
 
         <menuitem
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e1054a368c5..44387098eed 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -262,6 +262,8 @@ class hr_applicant(osv.Model):
             job_record = self.pool.get('hr.job').browse(cr, uid, job_id, context=context)
             if job_record and job_record.department_id:
                 return {'value': {'department_id': job_record.department_id.id}}
+            else:
+                return {'value': {'department_id': False}}
         return {}
 
     def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
@@ -450,7 +452,7 @@ class hr_applicant(osv.Model):
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
                                                      'department_id': applicant.department_id.id or False,
-                                                     'address_id': applicant.job_id and applicant.job_id.company_id and applicant.job_id.company_id.id or False,
+                                                     'address_id': applicant.company_id and applicant.company_id.partner_id and applicant.company_id.partner_id.id or False,
                                                      'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
                                                      'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
                                                      })