diff --git a/core/page/user_properties/user_properties.js b/core/page/user_properties/user_properties.js
index 986027a49d..b04232ea7c 100644
--- a/core/page/user_properties/user_properties.js
+++ b/core/page/user_properties/user_properties.js
@@ -191,14 +191,22 @@ wn.UserProperties = Class.extend({
 					d.set_value("defkey", me.get_property());
 					d.get_input("defkey").attr("disabled", true);
 				}
+				
 				d.fields_dict["defvalue"].get_query = function(txt) {
 					var key = d.get_value("defkey");
 					var doctype = $.map(me.options.link_fields, function(l) {
 						if(l[0]==key) return l[1];
 					})[0];
-					return 'select name from `tab'+doctype
-						+'` where name like "%s" limit 20'
-				}
+					
+					return {
+						query: "core.page.user_properties.user_properties.get_defvalue",
+						filters: {
+							doctype: doctype
+						},
+						doctype: doctype,
+					}
+				};
+				
 				d.get_input("add").click(function() {
 					var args = d.get_values();
 					if(!args) {
diff --git a/core/page/user_properties/user_properties.py b/core/page/user_properties/user_properties.py
index aace0fa5d3..e8cbcf6468 100644
--- a/core/page/user_properties/user_properties.py
+++ b/core/page/user_properties/user_properties.py
@@ -45,3 +45,7 @@ def remove(user, name):
 @webnotes.whitelist(allow_roles=["System Manager", "Administrator"])
 def add(parent, defkey, defvalue):
 	webnotes.defaults.add_user_default(defkey, defvalue, parent)
+	
+def get_defvalue(doctype, txt, searchfield, start, page_len, filters):
+	return webnotes.conn.sql("""select name from `tab%s` where name like %s limit 20""" % 
+		(filters.get("doctype"), "%s"), "%s%%" % (txt,))
\ No newline at end of file