diff --git a/erpnext/patches/v5_0/set_footer_address.py b/erpnext/patches/v5_0/set_footer_address.py
index 5eb5624..2779e48 100644
--- a/erpnext/patches/v5_0/set_footer_address.py
+++ b/erpnext/patches/v5_0/set_footer_address.py
@@ -1,6 +1,7 @@
 import frappe
 
 def execute():
+	frappe.reload_doctype("System Settings")
 	ss = frappe.get_doc("System Settings", "System Settings")
 	ss.email_footer_address = frappe.db.get_default("company")
 	ss.save()
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 7e5dc32..9f1a8eb 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -98,7 +98,7 @@
 	},
 
 	hide_currency_and_price_list: function() {
-		if(this.frm.doc.docstatus > 0) {
+		if(this.frm.doc.conversion_rate == 1 && this.frm.doc.docstatus > 0) {
 			hide_field("currency_and_price_list");
 		} else {
 			unhide_field("currency_and_price_list");