diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.js b/erpnext/hr/doctype/employee_advance/employee_advance.js
index 3aa2eeaedc6..a589aaf9bc5 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.js
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.js
@@ -144,7 +144,6 @@ frappe.ui.form.on('Employee Advance', {
 	employee: function (frm) {
 		if (frm.doc.employee) {
 			frm.trigger('get_pending_amount');
-			// frm.trigger('get_employee_currency');
 		}
 	},
 
@@ -163,21 +162,6 @@ frappe.ui.form.on('Employee Advance', {
 		});
 	},
 
-	// get_employee_currency: function(frm) {
-	// 	frappe.call({
-	// 		method: "erpnext.payroll.doctype.salary_structure_assignment.salary_structure_assignment.get_employee_currency",
-	// 		args: {
-	// 			employee: frm.doc.employee,
-	// 		},
-	// 		callback: function(r) {
-	// 			if(r.message) {
-	// 				frm.set_value('currency', r.message);
-	// 				frm.refresh_fields();
-	// 			}
-	// 		}
-	// 	});
-	// },
-
 	currency: function(frm) {
 		var from_currency = frm.doc.currency;
 		var company_currency;
diff --git a/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js b/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js
index f566243268a..cad01ce058a 100644
--- a/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js
+++ b/erpnext/payroll/doctype/employee_benefit_application/employee_benefit_application.js
@@ -3,7 +3,6 @@
 
 frappe.ui.form.on('Employee Benefit Application', {
 	employee: function(frm) {
-		// frm.trigger('get_employee_currency');
 		frm.trigger('set_earning_component');
 		var method, args;
 		if(frm.doc.employee && frm.doc.date && frm.doc.payroll_period){
diff --git a/erpnext/payroll/doctype/employee_incentive/employee_incentive.js b/erpnext/payroll/doctype/employee_incentive/employee_incentive.js
index 8279ec4e340..45ca386995b 100644
--- a/erpnext/payroll/doctype/employee_incentive/employee_incentive.js
+++ b/erpnext/payroll/doctype/employee_incentive/employee_incentive.js
@@ -23,40 +23,22 @@ frappe.ui.form.on('Employee Incentive', {
 
 	employee: function(frm) {
 		if (frm.doc.employee) {
-			frm.trigger('set_company');
-			frm.trigger('get_employee_currency');
+			frm.trigger('get_employee_details');
 		} else {
 			frm.set_value("company", null);
 		}
 	},
 
-	set_company: function(frm) {
+	get_employee_details: function(frm) {
 		frappe.call({
-			method: "frappe.client.get_value",
-			args:{
-				doctype: "Employee",
-				fieldname: "company",
-				filters:{
-					name: frm.doc.employee
-				}
-			},
-			callback: function(data) {
-				if(data.message){
-					frm.set_value("company", data.message.company);
-				}
-			}
-		});
-	},
-
-	get_employee_currency: function(frm) {
-		frappe.call({
-			method: "erpnext.payroll.doctype.salary_structure_assignment.salary_structure_assignment.get_employee_currency",
+			method: "get_employee_details",
 			args: {
 				employee: frm.doc.employee,
 			},
 			callback: function(r) {
 				if(r.message) {
-					frm.set_value('currency', r.message);
+					frm.set_value('currency', r.message['currency']);
+					frm.set_value('company', r.message['company']);
 					frm.refresh_fields();
 				}
 			}
diff --git a/erpnext/payroll/doctype/employee_incentive/employee_incentive.py b/erpnext/payroll/doctype/employee_incentive/employee_incentive.py
index ead3db126f7..c132ce4a591 100644
--- a/erpnext/payroll/doctype/employee_incentive/employee_incentive.py
+++ b/erpnext/payroll/doctype/employee_incentive/employee_incentive.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from erpnext.payroll.doctype.salary_structure_assignment.salary_structure_assignment import get_employee_currency
 
 class EmployeeIncentive(Document):
 	def validate(self):
@@ -29,3 +30,11 @@ class EmployeeIncentive(Document):
 		additional_salary.ref_doctype = self.doctype
 		additional_salary.ref_docname = self.name
 		additional_salary.submit()
+
+	def get_employee_details(self, employee):
+		employee_currency = get_employee_currency(employee)
+		company = frappe.db.get_value('Employee', employee, 'company')
+		return {
+			'currency': employee_currency,
+			'company': company
+		}