diff --git a/templates/emails/activation.html b/templates/emails/activation.html
index b1ba1e05..b10f3736 100644
--- a/templates/emails/activation.html
+++ b/templates/emails/activation.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + name + ",") }}
+  {{ render_text("Hi " + name) }}
   {{ render_text("Thank you for choosing SimpleLogin.") }}
   {{ render_text("To get started, please confirm that <b>" + email + "</b> is your email address by clicking on the button below or use this link " + activation_link + " within 1 hour.") }}
   {{ render_button("Verify", activation_link) }}
diff --git a/templates/emails/activation.txt b/templates/emails/activation.txt
index 70350724..65df1a38 100644
--- a/templates/emails/activation.txt
+++ b/templates/emails/activation.txt
@@ -1,4 +1,4 @@
-Hi {{name}},
+Hi {{name}}
 
 Thank you for choosing SimpleLogin.
 
diff --git a/templates/emails/change-email.html b/templates/emails/change-email.html
index 2988a4ec..5f068281 100644
--- a/templates/emails/change-email.html
+++ b/templates/emails/change-email.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + name + ",") }}
+  {{ render_text("Hi " + name) }}
   {{ render_text("You have asked to change your email to: <br><b>"+ new_email +"</b>.") }}
   {{ render_text("Your current email is: <br>" + current_email + ".") }}
   {{ render_text("To confirm, please click on the button below or use this link: <br> " + link + "<br> within 12 hours.") }}
diff --git a/templates/emails/change-email.txt b/templates/emails/change-email.txt
index 7ac950f9..0d475bc1 100644
--- a/templates/emails/change-email.txt
+++ b/templates/emails/change-email.txt
@@ -1,4 +1,4 @@
-Hi {{name}},
+Hi {{name}}
 
 You have asked to change your email to {{new_email}}.
 
diff --git a/templates/emails/new-app.html b/templates/emails/new-app.html
index 969a3913..9ed4aac8 100644
--- a/templates/emails/new-app.html
+++ b/templates/emails/new-app.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + name + ",") }}
+  {{ render_text("Hi " + name) }}
   {{ render_text("This is Son, SimpleLogin Founder 😊.") }}
   {{ render_text("Even though I lead the company, I’m the *product person* and the user experience you get from our product means a lot to me.") }}
   {{ render_text('Our users and developers love SimpleLogin and its simplicity (hence the "simple" in the name 😉), but if there\'s anything that\'s bugging you, even the smallest of issues that could be done better, I want to hear about it - so hit the reply button.') }}
diff --git a/templates/emails/new-app.txt b/templates/emails/new-app.txt
index bf7d8785..1de54cd4 100644
--- a/templates/emails/new-app.txt
+++ b/templates/emails/new-app.txt
@@ -1,4 +1,4 @@
-Hi {{name}},
+Hi {{name}}
 
 This is Son, SimpleLogin Founder 😊.
 
diff --git a/templates/emails/reset-password.html b/templates/emails/reset-password.html
index e7c246c2..874bf9b9 100644
--- a/templates/emails/reset-password.html
+++ b/templates/emails/reset-password.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + name + ",") }}
+  {{ render_text("Hi " + name) }}
   {{ render_text("You have asked to change your password.") }}
   {{ render_text("To confirm, please click on the button below or use this link " + reset_password_link + " within 1 hour.") }}
   {{ render_button("Reset password", reset_password_link) }}
diff --git a/templates/emails/reset-password.txt b/templates/emails/reset-password.txt
index 7afcecba..fa4e5add 100644
--- a/templates/emails/reset-password.txt
+++ b/templates/emails/reset-password.txt
@@ -1,4 +1,4 @@
-Hi {{name}},
+Hi {{name}}
 
 To reset or change your password, please click on this link:
 
diff --git a/templates/emails/test-email.html b/templates/emails/test-email.html
index 66a0ecba..63c8f1dc 100644
--- a/templates/emails/test-email.html
+++ b/templates/emails/test-email.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + name + ",") }}
+  {{ render_text("Hi " + name) }}
   {{ render_text("This is a test to make sure that you receive emails sent to your alias <b>" + alias + "</b>.") }}
   {{ render_text("If you have any questions, feel free to reply to this email.") }}
 {% endblock %}
diff --git a/templates/emails/test-email.txt b/templates/emails/test-email.txt
index b2332aa6..628bbe2d 100644
--- a/templates/emails/test-email.txt
+++ b/templates/emails/test-email.txt
@@ -1,4 +1,4 @@
-Hi {{name}}!
+Hi {{name}}
 
 This is a test to make sure that you receive emails sent to your alias {{alias}}.