diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index 88f784dc4..c81e6fc74 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,9 +1,13 @@
 <td style="padding-bottom: 20px; padding-left: 10px;">
 
   <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
-    <%= t("devise_views.mailer.confirmation_instructions.welcome") %> <strong><%= @email %></strong>
+    <%= t("devise_views.mailer.confirmation_instructions.title") %>
   </h1>
 
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.confirmation_instructions.welcome") %> <strong><%= @email %></strong>
+  </p>
+
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
     <%= t("devise_views.mailer.confirmation_instructions.text") %>
   </p>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
index 0e7951813..a67e77f08 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -17,10 +17,6 @@
   </p>
 
   <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= t("devise_views.mailer.reset_password_instructions.ignore_text") %>
-  </p>
-
-  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
-    <%= t("devise_views.mailer.reset_password_instructions.info_text") %>
+    <%= t("devise_views.mailer.reset_password_instructions.ignore_text") %> <%= t("devise_views.mailer.reset_password_instructions.info_text") %>
   </p>
 </td>
diff --git a/config/locales/devise_views.en.yml b/config/locales/devise_views.en.yml
index 9c9fbec5a..08a303834 100644
--- a/config/locales/devise_views.en.yml
+++ b/config/locales/devise_views.en.yml
@@ -6,13 +6,14 @@ en:
       submit: "Resend confirmation instructions"
     mailer:
       confirmation_instructions:
+        title: "Welcome to open government"
         welcome: "Welcome"
         text: "You can confirm your account email through the link below:"
         confirm_link: "Confirm my account"
       reset_password_instructions:
         hello: "Hello"
         title: Change your password
-        text: "Someone has requested a link to change your password. You can do this through the link below."
+        text: "Someone has requested to change your password. You can do this through the link below:"
         change_link: "Change my password"
         ignore_text: "If you didn't request this, please ignore this email."
         info_text: "Your password won't change until you access the link above and create a new one."
diff --git a/config/locales/devise_views.es.yml b/config/locales/devise_views.es.yml
index 5a9fa4e01..6ab6ebbb5 100644
--- a/config/locales/devise_views.es.yml
+++ b/config/locales/devise_views.es.yml
@@ -6,15 +6,16 @@ es:
       submit: "Reenviar instrucciones de confirmación"
     mailer:
       confirmation_instructions:
-        welcome: "Bienvenido"
+        title: "Bienvenido/a a gobierno abierto"
+        welcome: "Bienvenido/a"
         text: "Puedes confirmar tu cuenta de correo electrónico en el siguiente enlace:"
         confirm_link: "Confirmar mi cuenta"
       reset_password_instructions:
         hello: "Hola"
         title: "Cambiar tu contraseña"
-        text: "Se ha solicitado un enlace para cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
-        change_link: "cambiar mi contraseña"
-        ignore_text: "Si tu no lo has solicitado, puedes ignorar este email"
+        text: "Se ha solicitado cambiar tu contraseña, puedes hacerlo en el siguiente enlace:"
+        change_link: "Cambiar mi contraseña"
+        ignore_text: "Si tu no lo has solicitado, puedes ignorar este email."
         info_text: "Tu contraseña no cambiará hasta que no accedas al enlace y la modifiques."
       unlock_instructions:
         hello: "Hola"