diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
index 4f161ec..ed952b9 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
@@ -317,6 +317,7 @@
 			})
 
 			journal_entry.set("accounts", accounts)
+			journal_entry.title = default_payroll_payable_account
 			journal_entry.save()
 
 			try:
@@ -337,8 +338,8 @@
 			""" % ('%s', '%s', cond), (self.start_date, self.end_date), as_list = True)
 
 		if salary_slip_name_list and len(salary_slip_name_list) > 0:
+			salary_slip_total = 0
 			for salary_slip_name in salary_slip_name_list:
-				salary_slip_total = 0
 				salary_slip = frappe.get_doc("Salary Slip", salary_slip_name[0])
 				for sal_detail in salary_slip.earnings:
 					is_flexible_benefit, only_tax_impact, creat_separate_je = frappe.db.get_value("Salary Component", \
@@ -348,8 +349,8 @@
 							self.create_journal_entry(sal_detail.amount, sal_detail.salary_component)
 						else:
 							salary_slip_total += sal_detail.amount
-				if salary_slip_total > 0:
-					self.create_journal_entry(salary_slip_total, "salary")
+			if salary_slip_total > 0:
+				self.create_journal_entry(salary_slip_total, "salary")
 
 	def create_journal_entry(self, je_payment_amount, user_remark):
 		default_payroll_payable_account = self.get_default_payroll_payable_account()
diff --git a/erpnext/hr/doctype/salary_component/salary_component.js b/erpnext/hr/doctype/salary_component/salary_component.js
index a7e2899..74afd54 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.js
+++ b/erpnext/hr/doctype/salary_component/salary_component.js
@@ -52,10 +52,16 @@
 	create_separate_payment_entry_against_benefit_claim: function(frm) {
 		if(frm.doc.create_separate_payment_entry_against_benefit_claim){
 			frm.set_df_property("accounts", "reqd", 1);
+			frm.set_value("only_tax_impact", 0);
 		}
 		else{
 			frm.set_df_property("accounts", "reqd", 0);
 		}
+	},
+	only_tax_impact: function(frm) {
+		if(frm.only_tax_impact){
+			frm.set_value("create_separate_payment_entry_against_benefit_claim", 0);
+		}
 	}
 });
 
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index b92098f..bd3dd20 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -410,7 +410,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:doc.type==\"Earning\" && doc.is_additional_component != 1", 
+   "depends_on": "eval:doc.type==\"Earning\" && doc.is_additional_component != 1 && doc.statistical_component!=1", 
    "fieldname": "flexible_benefits", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -573,7 +573,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "is_flexible_benefit", 
+   "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.create_separate_payment_entry_against_benefit_claim !=1", 
    "fieldname": "only_tax_impact", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -606,7 +606,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "is_flexible_benefit", 
+   "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.only_tax_impact !=1", 
    "fieldname": "create_separate_payment_entry_against_benefit_claim", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -703,7 +703,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:doc.is_payable == 1", 
+   "depends_on": "eval:doc.is_payable == 1 && doc.statistical_component != 1", 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1003,7 +1003,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-06-22 17:27:08.334858", 
+ "modified": "2018-06-29 13:59:12.958648", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Component", 
@@ -1057,4 +1057,4 @@
  "sort_order": "DESC", 
  "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}