diff --git a/core/doctype/communication/communication.js b/core/doctype/communication/communication.js
index dfbcb5f498..87b601a2ca 100644
--- a/core/doctype/communication/communication.js
+++ b/core/doctype/communication/communication.js
@@ -7,7 +7,7 @@ cur_frm.cscript.onload = function(doc) {
 	
 	cur_frm.fields_dict.lead.get_query = function() {
 		return {
-			query: "core.doctype.communication.communication.get_user"
+			query: "core.doctype.communication.communication.get_lead"
 		}
 	};
 	
diff --git a/public/js/wn/form/control.js b/public/js/wn/form/control.js
index 6f7c41371c..193e940d52 100644
--- a/public/js/wn/form/control.js
+++ b/public/js/wn/form/control.js
@@ -674,10 +674,6 @@ wn.ui.form.ControlLink = wn.ui.form.ControlData.extend({
 				});
 			},
 			open: function(event, ui) {
-				if(cur_dialog) {
-					var zindex = cint(cur_dialog.$wrapper.css("z-index")) + 1
-					$(this).autocomplete("widget").css("z-index", zindex);
-				}
 				me.autocomplete_open = true;
 			},
 			close: function(event, ui) {
diff --git a/public/js/wn/ui/dialog.js b/public/js/wn/ui/dialog.js
index dd5b69d6cc..d56c25a9b0 100644
--- a/public/js/wn/ui/dialog.js
+++ b/public/js/wn/ui/dialog.js
@@ -26,8 +26,9 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({
 		$.extend(this, opts);
 		this.make();
 	},
-	make: function() {		
-		this.$wrapper = $('<div class="modal" style="overflow: auto;">\
+	make: function() {
+		// ui-front class is used as appendTo by jquery.autocomplete
+		this.$wrapper = $('<div class="modal ui-front" style="overflow: auto;">\
 			<div class="modal-dialog">\
 				<div class="modal-content">\
 					<div class="modal-header">\
diff --git a/public/js/wn/views/communication.js b/public/js/wn/views/communication.js
index 2df34aaa9c..88a5580520 100644
--- a/public/js/wn/views/communication.js
+++ b/public/js/wn/views/communication.js
@@ -345,6 +345,7 @@ wn.views.CommunicationComposer = Class.extend({
 						}
 					});
 				},
+				appendTo: this.dialog.$wrapper,
 				focus: function() {
 					// prevent value inserted on focus
 					return false;