diff --git a/accounts/doctype/account/account.js b/accounts/doctype/account/account.js
index d34601b..a54c83a 100644
--- a/accounts/doctype/account/account.js
+++ b/accounts/doctype/account/account.js
@@ -35,6 +35,10 @@
 	// hide fields if group
 	cur_frm.toggle_display(['account_type', 'master_type', 'master_name', 'freeze_account', 
 		'credit_days', 'credit_limit', 'tax_rate'], doc.group_or_ledger=='Ledger')	
+		
+	// disable fields
+	cur_frm.toggle_enable(['account_name', 'debit_or_credit', 'group_or_ledger', 
+		'is_pl_account', 'company'], false);
 
 	// read-only for root accounts
   	root_acc = ['Application of Funds (Assets)','Expenses','Income','Source of Funds (Liabilities)'];
@@ -45,7 +49,7 @@
 		// credit days and type if customer or supplier
 		cur_frm.set_intro(null);
 		cur_frm.toggle_display(['credit_days', 'credit_limit'], 
-			in_list(['Customer', 'Supplier'], doc.master_type))
+			in_list(['Customer', 'Supplier'], doc.master_type));
 
 		// hide tax_rate
 		cur_frm.cscript.account_type(doc, cdt, cdn);
@@ -55,6 +59,12 @@
 	}
 }
 
+cur_frm.cscript.master_type = function(doc, cdt, cdn) {
+	cur_frm.toggle_display(['credit_days', 'credit_limit', 'master_name'], 
+		in_list(['Customer', 'Supplier'], doc.master_type));
+}
+
+
 // Fetch parent details
 // -----------------------------------------
 cur_frm.add_fetch('parent_account', 'debit_or_credit', 'debit_or_credit');