diff --git a/frappe/__init__.py b/frappe/__init__.py
index 4647ab63b5..0262e5b9ee 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -471,7 +471,7 @@ def delete_doc_if_exists(doctype, name):
 
 def reload_doctype(doctype):
 	"""Reload DocType from model (`[module]/[doctype]/[name]/[name].json`) files."""
-	reload_doc(db.get_value("DocType", doctype, "module"), "doctype", doctype)
+	reload_doc(db.get_value("DocType", doctype, "module"), "doctype", scrub(doctype))
 
 def reload_doc(module, dt=None, dn=None, force=False):
 	"""Reload Document from model (`[module]/[doctype]/[name]/[name].json`) files.
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index f6c7610f15..4af672b29a 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -127,10 +127,13 @@ frappe.ui.form.ControlImage = frappe.ui.form.Control.extend({
 			.css({"max-width": "600px", "margin": "0px"});
 		this.$body = $("<div></div>").appendTo(this.$wrapper)
 			.css({"margin-bottom": "10px", "max-width": "100%"})
+			
 		this.$wrapper.on("refresh", function() {
 				me.$body.empty();
-				if(me.df.options && me.frm.doc[me.df.options]) {
-					me.$img = $("<img src='"+me.frm.doc[me.df.options]+"' style='max-width: 100%;'>")
+				
+				var doc = frappe.model.get_doc(me.doctype, me.docname);
+				if(me.df.options && doc[me.df.options]) {
+					me.$img = $("<img src='"+doc[me.df.options]+"' style='max-width: 100%;'>")
 						.appendTo(me.$body);
 				} else {
 					me.$buffer = $("<div class='missing-image'><i class='octicon octicon-circle-slash'></i></div>")