diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index c4387bdc13..a5fc7926bf 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -43,16 +43,6 @@ frappe.ui.form.quick_entry = function(doctype, success) {
 
 		dialog.doc = doc;
 
-		// set defaults
-		mandatory.forEach(function(df) {
-			var field = dialog.get_field(df.fieldname);
-			field.doctype = doc.doctype;
-			field.docname = doc.name;
-			if(doc[df.fieldname]) {
-				field.set_value(doc[df.fieldname]);
-			}
-		});
-
 		dialog.set_primary_action(__('Save'), function() {
 			var values = dialog.get_values();
 
@@ -93,5 +83,16 @@ frappe.ui.form.quick_entry = function(doctype, success) {
 		});
 
 		dialog.show();
+
+		// set defaults
+		$.each(dialog.fields_dict, function(fieldname, field) {
+			field.doctype = doc.doctype;
+			field.docname = doc.name;
+
+			if(doc[fieldname]) {
+				field.set_input(doc[fieldname]);
+			}
+		});
+
 	});
 }
\ No newline at end of file
diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js
index 51804446e6..f0ff606475 100644
--- a/frappe/public/js/frappe/model/create_new.js
+++ b/frappe/public/js/frappe/model/create_new.js
@@ -48,7 +48,7 @@ $.extend(frappe.model, {
 		if(frappe.route_options) {
 			$.each(frappe.route_options, function(fieldname, value) {
 				if(frappe.meta.has_field(doctype, fieldname)) {
-					doc.fieldname=value;
+					doc[fieldname]=value;
 				}
 			});
 			frappe.route_options = null;