diff --git a/langs/english.json b/langs/english.json
index 90721533..8092128e 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -234,7 +234,6 @@
 	"NoticePhrases": {
 		"account_banned":"Your account has been suspended. Some of your permissions may have been revoked.",
 		"account_inactive":"Your account hasn't been activated yet. Some features may remain unavailable until it is.",
-		"account_password_updated":"Your password was successfully updated",
 		"account_avatar_updated":"Your avatar was successfully updated",
 		"account_username_updated":"Your username was successfully updated",
 		"account_mail_disabled":"The mail system is currently disabled.",
diff --git a/member_routes.go b/member_routes.go
index 79a01020..14029d42 100644
--- a/member_routes.go
+++ b/member_routes.go
@@ -259,7 +259,7 @@ func routeReportSubmit(w http.ResponseWriter, r *http.Request, user common.User,
 }
 
 func routeAccountEditCriticalSubmit(w http.ResponseWriter, r *http.Request, user common.User) common.RouteError {
-	headerVars, ferr := common.UserCheck(w, r, &user)
+	_, ferr := common.SimpleUserCheck(w, r, &user)
 	if ferr != nil {
 		return ferr
 	}
@@ -289,16 +289,7 @@ func routeAccountEditCriticalSubmit(w http.ResponseWriter, r *http.Request, user
 
 	// Log the user out as a safety precaution
 	common.Auth.ForceLogout(user.ID)
-
-	headerVars.NoticeList = append(headerVars.NoticeList, common.GetNoticePhrase("account_password_updated"))
-	pi := common.Page{"Edit Password", user, headerVars, tList, nil}
-	if common.RunPreRenderHook("pre_render_account_own_edit_critical", w, r, &user, &pi) {
-		return nil
-	}
-	err = common.Templates.ExecuteTemplate(w, "account_own_edit.html", pi)
-	if err != nil {
-		return common.InternalError(err, w, r)
-	}
+	http.Redirect(w, r, "/", http.StatusSeeOther)
 	return nil
 }
 
diff --git a/templates/account_own_edit.html b/templates/account_own_edit.html
index 71a0cb6a..4418be2a 100644
--- a/templates/account_own_edit.html
+++ b/templates/account_own_edit.html
@@ -6,7 +6,7 @@
 			<div class="rowitem"><h1>{{lang "account_password_head"}}</h1></div>
 		</div>
 		<div class="colstack_item the_form">
-			<form action="/user/edit/critical/submit/" method="post">
+			<form action="/user/edit/critical/submit/?session={{.CurrentUser.Session}}" method="post">
 				<div class="formrow real_first_child">
 					<div class="formitem formlabel"><a>{{lang "account_password_current_password"}}</a></div>
 					<div class="formitem"><input name="account-current-password" type="password" placeholder="*****" required /></div>
diff --git a/templates/account_own_edit_username.html b/templates/account_own_edit_username.html
index 33eb5bf0..1844aaa4 100644
--- a/templates/account_own_edit_username.html
+++ b/templates/account_own_edit_username.html
@@ -6,7 +6,7 @@
 			<div class="rowitem"><h1>{{lang "account_username_head"}}</h1></div>
 		</div>
 		<div class="colstack_item the_form">
-			<form action="/user/edit/username/submit/" method="post">
+			<form action="/user/edit/username/submit/?session={{.CurrentUser.Session}}" method="post">
 				<div class="formrow real_first_child">
 					<div class="formitem formlabel"><a>{{lang "account_username_current_username"}}</a></div>
 					<div class="formitem formlabel">{{.CurrentUser.Name}}</div>