diff --git a/greenmine/base/templates/emails/base.jinja b/greenmine/base/templates/emails/base.jinja
index fb3757bd..640f8a51 100644
--- a/greenmine/base/templates/emails/base.jinja
+++ b/greenmine/base/templates/emails/base.jinja
@@ -1,5 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
    "http://www.w3.org/TR/html4/loose.dtd">
+
+{% set home_url = resolve_front_url("home") %}
+{% set home_url_name = "Greenmine" %}
+
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -89,7 +93,8 @@
                                    class="table-header">
                                 <tr>
                                     <td>
-                                        <a href="#" title="Greenmine">
+                                        <a href="{{ home_url }}"
+                                           title="{{ home_url_name }}">
                                             <img src="" alt="Greenmine" height="32" />
                                         </a>
                                     </td>
@@ -105,8 +110,9 @@
                                               margin-bottom: 180px;
                                               font-family: Arial, Helvetica, sans-serif;
                                               color: #6c6c6c;" align="left">
-                            {% block body %}
-                            <!-- BODY -->
+                        <!-- BODY -->
+                        {% block body %}{% endblock %}
+                        {#
                             <table border="0" width="100%" cellpadding="0" cellspacing="0"
                                    class="table-body">
                                 <tr>
@@ -122,7 +128,7 @@
                                     </td>
                                 </tr>
                             </table>
-                            {% endblock %}
+                        #}
                         </td>
                     </tr>
                 </tbody>
@@ -132,10 +138,16 @@
                                               font-size: 14px; line-height: 20px;
                                               font-family: Arial, Helvetica, sans-serif;
                                               color: #CCC;" align="left">
+                        {% block footer %}
+                        {#
                             <p style="padding: 10px; border-top: 1px solid #eee;">
                                 More info at:
-                                <a style="color: #666;" href="{{ final_url }}">Greenmine</a>
+                                <a href="{{ final_url }}" style="color: #666;">
+                                    {{ final_url_name }}
+                                </a>
                             </p>
+                        #}
+                        {% endblock %}
                         </td>
                     </tr>
                 </tfoot>
