7 files changed, 44 insertions, 10 deletions
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 166b005d4..eb547d953 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -51,7 +51,7 @@
         <% if @is_you %>
             (just to see how it works)
             <br><%= link_to "Change your password", signchangepassword_url() %> |
-            <%= link_to "Change your email", signchangeemail_url(:r => request.request_uri) %>
+            <%= link_to "Change your email", signchangeemail_url() %>
         <% end %>
     </p>
 
diff --git a/app/views/user/signchangeemail.rhtml b/app/views/user/signchangeemail.rhtml
index 2d9b15895..caed4235f 100644
--- a/app/views/user/signchangeemail.rhtml
+++ b/app/views/user/signchangeemail.rhtml
@@ -1,4 +1,4 @@
-<% @title = "Change your email address" %>
+<% @title = "Change your email address used on WhatDoTheyKnow.com" %>
 
 <% raise "internal error" if not @user %>
 
@@ -8,7 +8,7 @@
     <%= foi_error_messages_for :signchangeemail %>
 
     <div class="form_note">
-    <h1>Change your email address</h1>
+    <h1>Change your email address used on WhatDoTheyKnow.com</h1>
     </div>
 
     <p>
@@ -34,8 +34,7 @@
 
     <div class="form_button">
     <%= hidden_field_tag 'submitted_signchangeemail_do', 1 %>
-    <%= hidden_field_tag 'token', params[:token], { :id => 'signin_token' } %>
-    <%= submit_tag "Change email" %>
+    <%= submit_tag "Change email on WhatDoTheyKnow.com" %>
     </div>
 <% end %>
 
diff --git a/app/views/user/signchangeemail_confirm.rhtml b/app/views/user/signchangeemail_confirm.rhtml
new file mode 100644
index 000000000..96acbf424
--- /dev/null
+++ b/app/views/user/signchangeemail_confirm.rhtml
@@ -0,0 +1,14 @@
+<% @title = h("Now check your email!") %>
+
+<h1 class="confirmation_heading">Now check your email!</h1>
+
+<p class="confirmation_message">
+We've sent an email to your new email address. You'll need to click the link in
+it before your email address will be changed.
+</p>
+
+<p class="confirmation_message">
+<small>If you use web-based email or have "junk mail" filters, also check your
+bulk/spam mail folders. Sometimes, our messages are marked that way.</small>
+</p>
+
diff --git a/app/views/user/signchangepassword.rhtml b/app/views/user/signchangepassword.rhtml
index 11dc987ee..4191344cb 100644
--- a/app/views/user/signchangepassword.rhtml
+++ b/app/views/user/signchangepassword.rhtml
@@ -1,4 +1,4 @@
-<% @title = "Change your password" %>
+<% @title = "Change your password on WhatDoTheyKnow.com" %>
 
 <% raise "internal error" if not @user %>
 
@@ -8,7 +8,7 @@
     <%= foi_error_messages_for :user %>
 
     <div class="form_note">
-    <h1>Change your password</h1>
+    <h1>Change your password on WhatDoTheyKnow.com</h1>
     </div>
 
     <p>
@@ -24,7 +24,7 @@
     <div class="form_button">
     <%= hidden_field_tag 'submitted_signchangepassword_do', 1 %>
     <%= hidden_field_tag 'pretoken', params[:pretoken] %>
-    <%= submit_tag "Change password" %>
+    <%= submit_tag "Change password on WhatDoTheyKnow.com" %>
     </div>
 <% end %>
 
diff --git a/app/views/user/signchangepassword_send_confirm.rhtml b/app/views/user/signchangepassword_send_confirm.rhtml
index 2ff670c34..8b2e4fa91 100644
--- a/app/views/user/signchangepassword_send_confirm.rhtml
+++ b/app/views/user/signchangepassword_send_confirm.rhtml
@@ -1,4 +1,4 @@
-<% @title = "Change password" %>
+<% @title = "Change your password on WhatDoTheyKnow.com" %>
 
 <div id="change_password">
 
@@ -6,7 +6,7 @@
     <%= foi_error_messages_for :signchangepassword %>
 
     <div class="form_note">
-    <h1>Change your password</h1>
+    <h1>Change your password on WhatDoTheyKnow.com</h1>
     </div>
 
     <p>
diff --git a/app/views/user_mailer/changeemail_already_used.rhtml b/app/views/user_mailer/changeemail_already_used.rhtml
new file mode 100644
index 000000000..0f60ad798
--- /dev/null
+++ b/app/views/user_mailer/changeemail_already_used.rhtml
@@ -0,0 +1,9 @@
+Someone, perhaps you, just tried to change their email address on
+WhatDoTheyKnow.com from <%=@old_email%> to <%=@new_email%>.
+
+This was not possible because there is already an account using 
+the email address <%=@new_email%>.
+
+The accounts have been left as they previously were.
+
+-- the WhatDoTheyKnow team
diff --git a/app/views/user_mailer/changeemail_confirm.rhtml b/app/views/user_mailer/changeemail_confirm.rhtml
new file mode 100644
index 000000000..9aa288fb0
--- /dev/null
+++ b/app/views/user_mailer/changeemail_confirm.rhtml
@@ -0,0 +1,12 @@
+<%= @name %>,
+
+Please click on the link below to confirm that you want to 
+change the email address that you use for WhatDoTheyKnow
+from <%=@old_email%> to <%=@new_email%>
+
+<%=@url%>
+
+We will not reveal your email addresses to anybody unless you
+or the law tell us to.
+
+-- the WhatDoTheyKnow team