diff --git a/stacktask/api/v1/templates/initial_password_completed.txt b/stacktask/api/v1/templates/initial_password_completed.txt
index ac61f65..4b40abf 100644
--- a/stacktask/api/v1/templates/initial_password_completed.txt
+++ b/stacktask/api/v1/templates/initial_password_completed.txt
@@ -1,8 +1,6 @@
-Thank you for joining Openstack!
+This email is to confirm that your Openstack account password has now been set up.
 
-Your account is now active and you can access the dashboard and APIs.
-
-You can find examples and documentation on using Openstack at http://www.openstack.org/
+If you did not do this yourself, please get in touch with your systems administrator to report suspicious activity and secure your account.
 
 Kind regards,
 The Openstack team
diff --git a/stacktask/api/v1/templates/initial_password_token.txt b/stacktask/api/v1/templates/initial_password_token.txt
index 4d3b020..6777ad8 100644
--- a/stacktask/api/v1/templates/initial_password_token.txt
+++ b/stacktask/api/v1/templates/initial_password_token.txt
@@ -1,11 +1,15 @@
 Hello,
 
-Almost there!
+Thank you for joining Openstack!
 
 Please follow this link to define your password to access Openstack:
 {{ tokenurl }}{{ token }}
 
+This link expires automatically after 24 hours. If expired, you can simply go to the dashboard and request a password reset.
+
 Once this is done you will have access to the dashboard and APIs.
 
+You can find examples and documentation on using Openstack at http://www.openstack.org/
+
 Kind regards,
 The Openstack team
diff --git a/stacktask/api/v1/templates/invite_user_token.txt b/stacktask/api/v1/templates/invite_user_token.txt
index f52f862..e19d234 100644
--- a/stacktask/api/v1/templates/invite_user_token.txt
+++ b/stacktask/api/v1/templates/invite_user_token.txt
@@ -4,7 +4,7 @@ Please click on this link to accept the invitation: {{ tokenurl }}{{ token }}
 New users will be asked to define a password when accepting the invitation.
 Existing users will be added to the project and do not need to provide additional information.
 
-This link will expire automatically in 24 hours. If expired, you will need to request another one from the person who invited you.
+This link will expire automatically after 24 hours. If expired, you will need to request another one from the person who invited you.
 
 Kind regards,
 The Openstack team
diff --git a/stacktask/api/v1/templates/password_reset_token.txt b/stacktask/api/v1/templates/password_reset_token.txt
index 9fd950c..40ad23a 100644
--- a/stacktask/api/v1/templates/password_reset_token.txt
+++ b/stacktask/api/v1/templates/password_reset_token.txt
@@ -5,7 +5,7 @@ We have received a request to reset your Openstack password.
 Please click the link below to reset your password:
 {{ tokenurl }}{{ token }}
 
-This link will expire automatically in 24 hours. If expired, you will need to request your password to be reset again.
+This link will expire automatically after 24 hours. If expired, you will need to request your password to be reset again.
 
 If you did not request this password change, please get in touch with your systems administrator to report suspicious activity and secure your account.