3 files changed, 51 insertions, 4 deletions
diff --git a/templates/web/base/auth/change_email.html b/templates/web/base/auth/change_email.html
new file mode 100644
index 000000000..58c864929
--- /dev/null
+++ b/templates/web/base/auth/change_email.html
@@ -0,0 +1,37 @@
+[% INCLUDE 'header.html', title = loc('Change email address'), bodyclass = 'authpage' %]
+
+<h1>[% loc('Change email address') %]</h1>
+
+[% IF c.req.args.0 == 'success' %]
+    <p class="form-success">[% loc('You have successfully confirmed your email address.') %]</p>
+[% END %]
+
+[% loc('Your email address') %]: [% c.user.email %]
+
+<form action="[% c.uri_for('change_email') %]" method="post" name="change_email">
+    <input type="hidden" name="token" value="[% csrf_token %]">
+
+    <fieldset>
+    [% IF email_error;
+        errors = {
+            missing = loc('Please enter your email'),
+            other   = loc('Please check your email address is correct')
+        };
+        loc_email_error = errors.$email_error || errors.other;
+    %]
+    <div class="form-error">[% loc_email_error %]</div>
+    [% END %]
+
+    <div class="form-field">
+        <label for="email">[% loc('New email address:') %]</label>
+        <input type="email" name="email" id="email" value="[% email | html %]">
+    </div>
+    <div class="final-submit">
+        <input type="submit" value="[% loc('Change email address') %]">
+    </div>
+
+    </fieldset>
+</form>
+
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html
index b4170c23e..44b695e0d 100644
--- a/templates/web/base/auth/change_password.html
+++ b/templates/web/base/auth/change_password.html
@@ -3,12 +3,14 @@
 <h1>[% loc('Change password') %]</h1>
 
 [% IF password_changed %]
-    <p id="fixed">[% loc('Your password has been changed') %]</p>
+    <p class="form-success">[% loc('Your password has been changed') %]</p>
 [% END %]
 
 
 <form action="[% c.uri_for('change_password') %]" method="post" name="change_password" class="fieldset">
+    <input type="hidden" name="token" value="[% csrf_token %]">
     
+    <fieldset>
     [% IF password_error;
 
         errors = {
@@ -29,10 +31,11 @@
         <label for="confirm">[% loc('Again:') %]</label>
         <input type="password" name="confirm" value="[% confirm | html %]">
     </div>
-    <div class="checkbox">
+    <div class="final-submit">
         <input type="submit" value="[% loc('Change password') %]">
     </div>
 
+    </fieldset>
 </form>
 
 
diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html
index 253dc26a1..a8bf8f1e0 100644
--- a/templates/web/base/auth/general.html
+++ b/templates/web/base/auth/general.html
@@ -86,8 +86,15 @@
             <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]">
         </div>
 
-        <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
-        <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
+        <div class="checkbox-group">
+            <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
+            <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
+        </div>
+
+        <div class="general-notes">
+            <p><strong>[% loc('Forgotten your password?') %]</strong>
+            [% loc('Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated.') %]</p>
+        </div>
 
     </div>
 [% END %]