diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 3fb1dfa0da..f8bab0d1a6 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -258,7 +258,6 @@ def get_formatted_html(subject, message, footer=None, print_html=None,
 		"site_url": get_url(),
 		"header": get_header(header),
 		"content": message,
-		"signature": get_signature(email_account),
 		"footer": get_footer(email_account, footer),
 		"title": subject,
 		"print_html": print_html,
diff --git a/frappe/templates/emails/standard.html b/frappe/templates/emails/standard.html
index 4a47c9cf90..4c28b5152e 100644
--- a/frappe/templates/emails/standard.html
+++ b/frappe/templates/emails/standard.html
@@ -37,7 +37,9 @@
 								<tr>
 									<td valign="top">
 										<p>{{ content }}</p>
+										{% if signature %}
 										<p class="signature">{{ signature }}</p>
+										{% endif %}
 									</td>
 								</tr>
 							</table>