diff --git a/erpnext/hr/doctype/salary_component/salary_component.js b/erpnext/hr/doctype/salary_component/salary_component.js
index 74afd54..b33451b 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.js
+++ b/erpnext/hr/doctype/salary_component/salary_component.js
@@ -27,11 +27,15 @@
 		if(frm.doc.is_flexible_benefit){
 			set_value_for_condition_and_formula(frm);
 			frm.set_value("is_additional_component", 0);
+			frm.set_value("formula", '');
+			frm.set_value("amount", 0);
 		}
 	},
 	is_additional_component: function(frm) {
 		if(frm.doc.is_additional_component){
 			frm.set_value("is_flexible_benefit", 0);
+			frm.set_value("formula", '');
+			frm.set_value("amount", 0);
 		}
 	},
 	type: function(frm) {
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index 40af90f..4221916 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -770,7 +770,7 @@
    "collapsible": 1, 
    "collapsible_depends_on": "", 
    "columns": 0, 
-   "depends_on": "eval:doc.is_flexible_benefit != 1 && doc.variable_based_on_taxable_salary != 1", 
+   "depends_on": "eval:doc.is_flexible_benefit != 1 && doc.variable_based_on_taxable_salary != 1 && doc.is_additional_component != 1", 
    "fieldname": "condition_and_formula", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -1003,7 +1003,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-06-29 17:44:14.491265", 
+ "modified": "2018-07-02 16:55:44.467519", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Component",