diff --git a/js/legacy/model/local_data.js b/js/legacy/model/local_data.js
index 2c8880d474..6a58c73252 100644
--- a/js/legacy/model/local_data.js
+++ b/js/legacy/model/local_data.js
@@ -113,13 +113,18 @@ LocalDB.set_default_values = function(doc) {
 	if(!docfields) {
 		return;
 	}
+	var fields_to_refresh = [];
 	for(var fid=0;fid<docfields.length;fid++) {
 		var f = docfields[fid];
 		if(!in_list(no_value_fields, f.fieldtype) && doc[f.fieldname]==null) {
 			var v = LocalDB.get_default_value(f.fieldname, f.fieldtype, f['default']);
-			if(v) doc[f.fieldname] = v;
+			if(v) {
+				doc[f.fieldname] = v;
+				fields_to_refresh.push(f.fieldname);
+			}
 		}
 	}
+	return fields_to_refresh;
 }
 // ======================================================================================
 
diff --git a/js/legacy/wnf.compressed.js b/js/legacy/wnf.compressed.js
index 4ec778ddd4..2a04d6cedd 100644
--- a/js/legacy/wnf.compressed.js
+++ b/js/legacy/wnf.compressed.js
@@ -801,7 +801,8 @@ if(d.localname)
 notify_rename_observers(d.doctype,d.localname,d.name);}}
 local_name_idx={};LocalDB.get_localname=function(doctype){if(!local_name_idx[doctype])local_name_idx[doctype]=1;var n='New '+get_doctype_label(doctype)+' '+local_name_idx[doctype];local_name_idx[doctype]++;return n;}
 LocalDB.set_default_values=function(doc){var doctype=doc.doctype;var docfields=fields_list[doctype];if(!docfields){return;}
-for(var fid=0;fid<docfields.length;fid++){var f=docfields[fid];if(!in_list(no_value_fields,f.fieldtype)&&doc[f.fieldname]==null){var v=LocalDB.get_default_value(f.fieldname,f.fieldtype,f['default']);if(v)doc[f.fieldname]=v;}}}
+var fields_to_refresh=[];for(var fid=0;fid<docfields.length;fid++){var f=docfields[fid];if(!in_list(no_value_fields,f.fieldtype)&&doc[f.fieldname]==null){var v=LocalDB.get_default_value(f.fieldname,f.fieldtype,f['default']);if(v){doc[f.fieldname]=v;fields_to_refresh.push(f.fieldname);}}}
+return fields_to_refresh;}
 LocalDB.is_doc_loaded=function(dt,dn){var exists=false;if(locals[dt]&&locals[dt][dn])exists=true;if(exists&&dt=='DocType'&&!locals[dt][dn].__islocal&&!frms[dt])
 exists=false;return exists;}
 function check_perm_match(p,dt,dn){if(!dn)return true;var out=false;if(p.match){if(user_defaults[p.match]){for(var i=0;i<user_defaults[p.match].length;i++){if(user_defaults[p.match][i]==locals[dt][dn][p.match]){return true;}}
diff --git a/py/webnotes/model/utils.py b/py/webnotes/model/utils.py
index 345656bcd6..e0f7ab67b8 100644
--- a/py/webnotes/model/utils.py
+++ b/py/webnotes/model/utils.py
@@ -148,7 +148,7 @@ def _make_html(doc, link_list):
 			# link field
 			if v and (k in link_list.keys()):
 				dt = link_list[k]
-				if type(dt)==str and dt.startswith('link:'):
+				if isinstance(dt, basestring) and dt.startswith('link:'):
 					dt = dt[5:]
 				v = '<a href="index.cgi?page=Form/%s/%s">%s</a>' % (dt, v, v)
 
diff --git a/py/webnotes/utils/__init__.py b/py/webnotes/utils/__init__.py
index 8c98586f68..07d577d9dd 100644
--- a/py/webnotes/utils/__init__.py
+++ b/py/webnotes/utils/__init__.py
@@ -61,7 +61,7 @@ def db_exists(dt, dn):
 def load_json(arg):
 	
 	# already a dictionary?
-	if type(arg)!=str:
+	if not isinstance(arg, basestring):
 		return arg
 	
 	try: import json
@@ -243,7 +243,7 @@ def timestamps_equal(t1, t2):
 def global_date_format(date):
 	import datetime
 
-	if type(date) in (str, unicode):
+	if isinstance(date, basestring):
 		date = getdate(date)
 	
 	return date.strftime('%d') + ' ' + month_name_full[int(date.strftime('%m'))] + ' ' + date.strftime('%Y')
@@ -273,7 +273,7 @@ def flt(s):
 	"""
 	Convert to float (ignore commas)
 	"""
-	if type(s)==str: # if string
+	if isinstance(s, basestring): # if string
 		s = s.replace(',','')
 	try: tmp = float(s)
 	except: tmp = 0
@@ -291,7 +291,7 @@ def cstr(s):
 	"""	
 	Convert to string
 	"""
-	if type(s) in (str, unicode):
+	if isinstance(s, basestring):
 		return s
 	elif s==None: 
 		return ''
diff --git a/py/webnotes/utils/email_lib/receive.py b/py/webnotes/utils/email_lib/receive.py
index ab2631e43c..62e1da4950 100644
--- a/py/webnotes/utils/email_lib/receive.py
+++ b/py/webnotes/utils/email_lib/receive.py
@@ -100,7 +100,7 @@ class POP3Mailbox:
 			use_ssl, host, username, password
 			(by name or object)
 		"""
-		if type(settings_doc)==str:
+		if isinstance(settings_doc, basestring):
 			from webnotes.model.doc import Document
 			self.settings = Document(settings_doc, settings_doc)
 		else:
diff --git a/py/webnotes/utils/email_lib/send.py b/py/webnotes/utils/email_lib/send.py
index c776eb67c4..0952f007d8 100644
--- a/py/webnotes/utils/email_lib/send.py
+++ b/py/webnotes/utils/email_lib/send.py
@@ -19,7 +19,7 @@ class EMail:
 		from email import Charset
 		Charset.add_charset('utf-8', Charset.QP, Charset.QP, 'utf-8')
 
-		if type(recipients)==str:
+		if isinstance(recipients, basestring):
 			recipients = recipients.replace(';', ',')
 			recipients = recipients.split(',')