diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 59a504b40d..feffbe6822 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -369,10 +369,10 @@ def get_footer(email_account, footer=None):
 	if email_account and email_account.footer:
 		args.update({'email_account_footer': email_account.footer})
 
-	company_address = frappe.db.get_default("email_footer_address")
+	sender_address = frappe.db.get_default("email_footer_address")
 
-	if company_address:
-		args.update({'company_address': company_address})
+	if sender_address:
+		args.update({'sender_address': sender_address})
 
 	if not cint(frappe.db.get_default("disable_standard_email_footer")):
 		args.update({'default_mail_footer': frappe.get_hooks('default_mail_footer')})
diff --git a/frappe/templates/emails/email_footer.html b/frappe/templates/emails/email_footer.html
index 4ad6cb23b5..da6cab5f35 100644
--- a/frappe/templates/emails/email_footer.html
+++ b/frappe/templates/emails/email_footer.html
@@ -6,10 +6,10 @@
 	</div>
 	{% endif %}
 
-	<!-- company_address -->
-	{% if company_address %}
-	<div class="company-address">
-		{% for line in company_address.splitlines(True) %}
+	<!-- sender_address -->
+	{% if sender_address %}
+	<div class="sender-address">
+		{% for line in sender_address.splitlines(True) %}
 		<div>{{ line }}</div>
 		{% endfor %}
 	</div>