diff --git a/default.go b/default.go
index b8e2e94..14dabc1 100644
--- a/default.go
+++ b/default.go
@@ -387,11 +387,13 @@ func (dt *Default) HTMLTemplate() string {
                         {{ end }}
                       {{ end }}
 
+                    {{ if .Email.Body.Signature }}
                     <p>
                       {{.Email.Body.Signature}},
                       <br />
                       {{.Hermes.Product.Name}}
                     </p>
+                    {{ end }}
 
                     {{ if (eq .Email.Body.FreeMarkdown "") }}
                       {{ with .Email.Body.Actions }} 
@@ -488,7 +490,10 @@ func (dt *Default) PlainTextTemplate() string {
     <p>{{ $line }}<p>
   {{ end }}
 {{ end }}
-<p>{{.Email.Body.Signature}},<br>{{.Hermes.Product.Name}} - {{.Hermes.Product.Link}}</p>
+{{if .Email.Body.Signature }}
+  <p>{{.Email.Body.Signature}},<br>{{.Hermes.Product.Name}} - {{.Hermes.Product.Link}}</p>
+{{ end }}
+
 
 <p>{{.Hermes.Product.Copyright}}</p>
 `
diff --git a/flat.go b/flat.go
index 955a568..6937202 100644
--- a/flat.go
+++ b/flat.go
@@ -387,11 +387,13 @@ func (dt *Flat) HTMLTemplate() string {
                         {{ end }}
                       {{ end }}
 
+                    {{ if .Email.Body.Signature }}
                     <p>
                       {{.Email.Body.Signature}},
                       <br />
                       {{.Hermes.Product.Name}}
                     </p>
+                    {{ end }}
 
                     {{ if (eq .Email.Body.FreeMarkdown "") }}
                       {{ with .Email.Body.Actions }} 
@@ -488,7 +490,9 @@ func (dt *Flat) PlainTextTemplate() string {
     <p>{{ $line }}<p>
   {{ end }}
 {{ end }}
-<p>{{.Email.Body.Signature}},<br>{{.Hermes.Product.Name}} - {{.Hermes.Product.Link}}</p>
+{{if .Email.Body.Signature }}
+  <p>{{.Email.Body.Signature}},<br>{{.Hermes.Product.Name}} - {{.Hermes.Product.Link}}</p>
+{{ end }}
 
 <p>{{.Hermes.Product.Copyright}}</p>
 `
diff --git a/hermes.go b/hermes.go
index 6848ef4..46a79c4 100644
--- a/hermes.go
+++ b/hermes.go
@@ -124,8 +124,8 @@ func setDefaultEmailValues(e *Email) error {
 			Intros:     []string{},
 			Dictionary: []Entry{},
 			Outros:     []string{},
-			Signature:  "Yours truly",
-			Greeting:   "Hi",
+			Signature:  "",
+			Greeting:   "",
 		},
 	}
 	// Merge the given email with default one