diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 1df1eec..cd13a72 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -2,9 +2,6 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Supplier", {
-	before_load: function(frm) {
-		frappe.setup_language_field(frm);
-	},
 	refresh: function(frm) {
 		if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
 			frm.toggle_display("naming_series", false);
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index bfcabff..a9c8f1a 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -224,7 +224,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "language", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -233,7 +233,7 @@
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Loading...", 
+   "options": "Language", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -714,7 +714,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:20:29.238820", 
+ "modified": "2016-08-23 05:43:20.950021", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 5b41ad8..20ecc7b 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -2,9 +2,6 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Customer", {
-	before_load: function(frm) {
-		frappe.setup_language_field(frm);
-	},
 	refresh: function(frm) {
 		if(frappe.defaults.get_default("cust_master_name")!="Naming Series") {
 			frm.toggle_display("naming_series", false);
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 60681fa..bbd23cb 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -430,7 +430,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "fieldname": "language", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -439,7 +439,7 @@
    "label": "Print Language", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Loading...", 
+   "options": "Language", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -957,7 +957,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:20:22.976925", 
+ "modified": "2016-08-23 05:43:04.309480", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
diff --git a/test_sites/languages.txt b/test_sites/languages.txt
deleted file mode 100644
index cf2b150..0000000
--- a/test_sites/languages.txt
+++ /dev/null
@@ -1 +0,0 @@
-en english
\ No newline at end of file