diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
index afe7dbe6bd8..9b952941d15 100644
--- a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
+++ b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6
@@ -21,7 +21,7 @@ export default {
     }
 
     DiscourseURL.rewrite(/^\/u\/([^\/]+)\/?$/, "/u/$1/summary", {
-      exceptions: ['/u/account-created', '/users/account-created']
+      exceptions: ['/u/account-created', '/users/account-created', '/u/password-reset', '/users/password-reset']
     });
   }
 };
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 3b1b7f00c27..814b281ee57 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -358,7 +358,7 @@ users:
     max: 60
   reserved_usernames:
     type: list
-    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|account-created"
+    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|hp|account-created|password-reset|admin-login|confirm-admin|account-created|activate-account|confirm-email-token|authorize-email"
   min_password_length:
     client: true
     default: 10