diff --git a/checkin_notes b/checkin_notes
index 5f6352072e..19069023c4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6317,3 +6317,12 @@ Charlie 31 Aug 2010
         client_state.cpp
     lib/
         procinfo_mac.cpp
+
+David  1 Sept 2010
+    - web: finish the above
+    html/
+        inc/
+            user.inc
+        user/
+            edit_passwd_form.php
+            edit_email_form.php
diff --git a/html/inc/user.inc b/html/inc/user.inc
index 6bc3f63487..e1631f884e 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -209,7 +209,7 @@ function show_user_info_private($user) {
     row2(tra("Postal code"), $user->postal_code);
     row2(tra("%1 member since", PROJECT), date_str($user->create_time));
     $url_tokens = url_tokens($user->authenticator);
-    row2(tra("Change"), "<a href=\"edit_email_form.php\">".tra("email address")."</a> | <a href=\"edit_passwd_form.php\">".tra("password")."</a> | <a href=\"edit_user_info_form.php?$url_tokens\">".tra("other account info")."</a>");
+    row2(tra("Change"), "<a href=\"edit_email_form.php\">".tra("email address")."</a> | <a href=\"".SECURE_URL_BASE."edit_passwd_form.php\">".tra("password")."</a> | <a href=\"edit_user_info_form.php?$url_tokens\">".tra("other account info")."</a>");
     row2("", "<a href=\"logout.php?$url_tokens\">".tra("Log out")."</a>");
     row2(tra("User ID")."<br/><span class=\"note\">".tra("Used in community functions")."</span>", $user->id);
     if (!no_computing()) {
diff --git a/html/user/edit_email_form.php b/html/user/edit_email_form.php
index 7094c95a8a..043d9d29bd 100644
--- a/html/user/edit_email_form.php
+++ b/html/user/edit_email_form.php
@@ -44,7 +44,7 @@ row2(tra("New email address").
 
 row2(
     tra("Password").
-    "<br><a href=edit_passwd_form.php><font size=-2>".tra("No password?")."</font></a>",
+    "<br><a href=".SECURE_URL_BASE."edit_passwd_form.php><font size=-2>".tra("No password?")."</font></a>",
     "<input type=password name=passwd>"
 );
 row2("", "<input type=submit value='".tra("Change email address")."'>");
diff --git a/html/user/edit_passwd_form.php b/html/user/edit_passwd_form.php
index 50ec4d511f..723f137654 100644
--- a/html/user/edit_passwd_form.php
+++ b/html/user/edit_passwd_form.php
@@ -26,7 +26,7 @@ $user = get_logged_in_user(false);
 page_head(tra("Change password"));
 
 echo "
-    <form method=post action=edit_passwd_action.php>
+    <form method=post action=".SECURE_URL_BASE."edit_passwd_action.php>
 ";