diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 8f6156cabe6..b5a7e08a501 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1226,11 +1226,6 @@ class hr_employee(osv.osv):
     _description = 'Employee'
 
     _columns = {
-        'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False, help="EPS Account Number"),
-        'pf_account':fields.char('PF Account', size=64, required=False, readonly=False, help="Providend Fund Account Number"),
-        'pg_joining': fields.date('PF Join Date'),
-        'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False, help="ESI Account Number"),
-        'hospital_id':fields.many2one('res.partner.address', 'ESI Hospital', required=False),
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a39fb1aa6d7..962b613158b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -119,18 +119,7 @@
                             <field name="manager" select="1"/>
                             <field name="vehicle" select="1"/>
                             <field name="vehicle_distance" select="1"/>
-                        </group>
-                        <group col="2" colspan="2" groups="base.group_extended">
-                            <separator colspan="2" string="ESI Information"/>
-                            <field name="esi_account" string="Account"/>
-                            <field name="hospital_id" string="Hospital"/>
                             <field name="medic_exam" select="1" string="Medical Examination"/>
-                            <field name="esp_account" select="1"/>
-                        </group>
-                        <group col="2" colspan="2" groups="base.group_extended">
-                            <separator colspan="2" string="Providend Fund"/>
-                            <field name="pf_account" string="Account"/>
-                            <field name="pg_joining" string="Join Date"/>
                         </group>
                     </page>
                     <page string="Contracts" groups="base.group_extended">
@@ -277,13 +266,13 @@
                         <page string="Work Permit">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Passport"/>
-                                <field name="passport_id"/>
+                                <field name="passport_id" domain="[('employee_id','=',employee_id)]"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Valid for"/>
-                                <field name="visa_no"/>
-                                <field name="permit_no"/>
-                                <field name="visa_expire"/>
+                                <field name="visa_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
+                                <field name="permit_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
+                                <field name="visa_expire" attrs="{'required': [('passport_id','!=',False), ]}"/>
                             </group>
                         </page>
                     </notebook>