diff --git a/locales/en.yml b/locales/en.yml
index 5ff20f033..c99192ed5 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -167,6 +167,10 @@ en:
       confirm_email: "Confirm Email"
       if_you_did_not: "If you did not request this, you can safely ignore this email."
       subject: "Email Confirmation"
+    password_reset:
+      we_received_a_request: "We received a request to reset your password. If you did not request this change, you can ignore this email."
+      if_you_did: "If you did,"
+      please_click: "please click here to reset password"
   embedlink:
     copy: "Copy to Clipboard"
   error:
diff --git a/locales/es.yml b/locales/es.yml
index 1f57c4861..9e7a8bcba 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -166,6 +166,10 @@ es:
       confirm_email: "Confirmar Correo"
       if_you_did_not: "Si no has pedido esto, puedes ignorar el correo."
       subject: "Confirmación de Correo"
+    password_reset:
+      we_received_a_request: "Recibimos un pedido para resetear su contraseña. Si no ha pedido ese cambio, por favor ignorar el correo. "
+      if_you_did: "Si lo hizo,"
+      please_click: "por favor cliquea aqui para resetear la contraseña."
   embedlink:
     copy: "Copiar al portapapeles"
   error:
diff --git a/services/email/password-reset.html.ejs b/services/email/password-reset.html.ejs
index e478ceeba..258f0d079 100644
--- a/services/email/password-reset.html.ejs
+++ b/services/email/password-reset.html.ejs
@@ -1,2 +1,2 @@
-<p>We received a request to reset your password. If you did not request this change, you can ignore this email.<br />
-If you did, <a href="<%= rootURL %>/admin/password-reset#<%= token %>">please click here to reset password</a>.</p>
+<p><%= t('email.password_reset.we_received_a_request') %><br />
+<%= t('email.password_reset.if_you_did') %> <a href="<%= rootURL %>/admin/password-reset#<%= token %>"><%= t('email.password_reset.please_click') %></a>.</p>
diff --git a/services/email/password-reset.txt.ejs b/services/email/password-reset.txt.ejs
index 1e44a6629..a8387925d 100644
--- a/services/email/password-reset.txt.ejs
+++ b/services/email/password-reset.txt.ejs
@@ -1,5 +1,3 @@
-We received a request to reset your password, click here to reset your password:
+<%= t('email.password_reset.we_received_a_request') %>. <%= t('email.password_reset.if_you_did') %> <%= t('email.password_reset.please_click') %>:
 
 <%= rootURL %>/admin/password-reset#<%= token %>
-
-If you did not request this change, you can ignore this email.
diff --git a/services/templates/email_confirm/es/html.ejs b/services/templates/email_confirm/es/html.ejs
deleted file mode 100644
index 1da7a1e9d..000000000
--- a/services/templates/email_confirm/es/html.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>Un correo de confirmación ha sido pedido para esta cuenta: <b><%= email %></b>.</p>
-<p>To confirm the account, please visit the following link: <a href="<%= rootURL %>/admin/confirm-email#<%= token %>">Confirm Email</a></p>
-<p>If you did not request this, you can safely ignore this email.</p>
diff --git a/services/templates/email_confirm/es/text.ejs b/services/templates/email_confirm/es/text.ejs
deleted file mode 100644
index 4c7d7d312..000000000
--- a/services/templates/email_confirm/es/text.ejs
+++ /dev/null
@@ -1,9 +0,0 @@
-A email confirmation has been requested for the following account:
-
-    <%= email %>
-
-To confirm the account, please visit the following link:
-
-    <%= rootURL %>/confirm/endpoint#<%= token %>
-
-If you did not request this, you can safely ignore this email.
diff --git a/services/templates/email_confirm/html.ejs b/services/templates/email_confirm/html.ejs
deleted file mode 100644
index dd2397edf..000000000
--- a/services/templates/email_confirm/html.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>A email confirmation has been requested for the following account: <b><%= email %></b>.</p>
-<p>To confirm the account, please visit the following link: <a href="<%= rootURL %>/admin/confirm-email#<%= token %>">Confirm Email</a></p>
-<p>If you did not request this, you can safely ignore this email.</p>
diff --git a/services/templates/email_confirm/text.ejs b/services/templates/email_confirm/text.ejs
deleted file mode 100644
index 4c7d7d312..000000000
--- a/services/templates/email_confirm/text.ejs
+++ /dev/null
@@ -1,9 +0,0 @@
-A email confirmation has been requested for the following account:
-
-    <%= email %>
-
-To confirm the account, please visit the following link:
-
-    <%= rootURL %>/confirm/endpoint#<%= token %>
-
-If you did not request this, you can safely ignore this email.
diff --git a/services/templates/notification/es/html.ejs b/services/templates/notification/es/html.ejs
deleted file mode 100644
index b36560ec5..000000000
--- a/services/templates/notification/es/html.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>
diff --git a/services/templates/notification/es/text.ejs b/services/templates/notification/es/text.ejs
deleted file mode 100644
index b36560ec5..000000000
--- a/services/templates/notification/es/text.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>
diff --git a/services/templates/notification/html.ejs b/services/templates/notification/html.ejs
deleted file mode 100644
index b36560ec5..000000000
--- a/services/templates/notification/html.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>
diff --git a/services/templates/notification/text.ejs b/services/templates/notification/text.ejs
deleted file mode 100644
index b36560ec5..000000000
--- a/services/templates/notification/text.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>
diff --git a/services/templates/password-reset/es/html.ejs b/services/templates/password-reset/es/html.ejs
deleted file mode 100644
index e478ceeba..000000000
--- a/services/templates/password-reset/es/html.ejs
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>We received a request to reset your password. If you did not request this change, you can ignore this email.<br />
-If you did, <a href="<%= rootURL %>/admin/password-reset#<%= token %>">please click here to reset password</a>.</p>
diff --git a/services/templates/password-reset/es/text.ejs b/services/templates/password-reset/es/text.ejs
deleted file mode 100644
index 1e44a6629..000000000
--- a/services/templates/password-reset/es/text.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-We received a request to reset your password, click here to reset your password:
-
-<%= rootURL %>/admin/password-reset#<%= token %>
-
-If you did not request this change, you can ignore this email.
diff --git a/services/templates/password-reset/html.ejs b/services/templates/password-reset/html.ejs
deleted file mode 100644
index e478ceeba..000000000
--- a/services/templates/password-reset/html.ejs
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>We received a request to reset your password. If you did not request this change, you can ignore this email.<br />
-If you did, <a href="<%= rootURL %>/admin/password-reset#<%= token %>">please click here to reset password</a>.</p>
diff --git a/services/templates/password-reset/text.ejs b/services/templates/password-reset/text.ejs
deleted file mode 100644
index 1e44a6629..000000000
--- a/services/templates/password-reset/text.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-We received a request to reset your password, click here to reset your password:
-
-<%= rootURL %>/admin/password-reset#<%= token %>
-
-If you did not request this change, you can ignore this email.
diff --git a/services/templates/suspension/es/html.ejs b/services/templates/suspension/es/html.ejs
deleted file mode 100644
index 4fd8f191c..000000000
--- a/services/templates/suspension/es/html.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body.replace(/\n/g, '<br />') %>
diff --git a/services/templates/suspension/es/text.ejs b/services/templates/suspension/es/text.ejs
deleted file mode 100644
index b36560ec5..000000000
--- a/services/templates/suspension/es/text.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>
diff --git a/services/templates/suspension/html.ejs b/services/templates/suspension/html.ejs
deleted file mode 100644
index 4fd8f191c..000000000
--- a/services/templates/suspension/html.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body.replace(/\n/g, '<br />') %>
diff --git a/services/templates/suspension/text.ejs b/services/templates/suspension/text.ejs
deleted file mode 100644
index b36560ec5..000000000
--- a/services/templates/suspension/text.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>