diff --git a/pkg/controller/account/settings.go b/pkg/controller/account/settings.go
index 2d8cadf..9c7445e 100644
--- a/pkg/controller/account/settings.go
+++ b/pkg/controller/account/settings.go
@@ -112,8 +112,8 @@ func Settings() http.HandlerFunc {
 				var (
 					oldPassword = r.PostFormValue("old_password")
 					changeEmail = strings.TrimSpace(strings.ToLower(r.PostFormValue("change_email")))
-					password1   = strings.TrimSpace(strings.ToLower(r.PostFormValue("new_password")))
-					password2   = r.PostFormValue("new_password2")
+					password1   = strings.TrimSpace(r.PostFormValue("new_password"))
+					password2   = strings.TrimSpace(r.PostFormValue("new_password2"))
 				)
 
 				// Their old password is needed to make any changes to their account.
@@ -171,6 +171,7 @@ func Settings() http.HandlerFunc {
 				// Changing their password?
 				if password1 != "" {
 					if password2 != password1 {
+						log.Error("pw1=%s  pw2=%s", password1, password2)
 						session.FlashError(w, r, "Couldn't change your password: your new passwords do not match.")
 					} else {
 						// Hash the new password.
diff --git a/web/templates/tos.html b/web/templates/tos.html
index 08ec731..6f2521e 100644
--- a/web/templates/tos.html
+++ b/web/templates/tos.html
@@ -29,7 +29,7 @@
 
         <p>
             If you have found content on this site that you believe to be in violation of the
-            rules, please <strong>report it</strong> at TBD or e-mail
+            rules, please <a href="/contact?intent=report"><strong>report it</strong></a> or e-mail
             <a href="mailto:abuse@nonshy.com">abuse@nonshy.com</a>.
         </p>