diff --git a/public/auth.php b/public/auth.php
index 8c00f69e..f97cc693 100644
--- a/public/auth.php
+++ b/public/auth.php
@@ -40,7 +40,7 @@ switch ($authMode) {
 
     case 'logout':
         if (!user_session_active()) {
-            header('Location: /');
+            header(sprintf('Location: %s', url('index')));
             return;
         }
 
@@ -48,7 +48,7 @@ switch ($authMode) {
             set_cookie_m('uid', '', -3600);
             set_cookie_m('sid', '', -3600);
             user_session_stop(true);
-            header('Location: /');
+            header(sprintf('Location: %s', url('index')));
             return;
         }
 
@@ -130,7 +130,7 @@ switch ($authMode) {
 
     case 'forgot':
         if (user_session_active() || !$canResetPassword) {
-            header('Location: /');
+            header(sprintf('Location: %s', url('index')));
             break;
         }
 
diff --git a/public/settings.php b/public/settings.php
index 6e34f2c5..9e863ad6 100644
--- a/public/settings.php
+++ b/public/settings.php
@@ -47,7 +47,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
             }
 
             if ($currentSessionKilled) {
-                header('Location: /');
+                header(sprintf('Location: %s', url('index')));
                 return;
             }
         }
diff --git a/src/comments.php b/src/comments.php
index a1d08d38..22c6f217 100644
--- a/src/comments.php
+++ b/src/comments.php
@@ -69,8 +69,8 @@ function comments_parse_for_display(string $text): string
         }
 
         return sprintf(
-            '<a href="/profile.php?u=%d" class="comment__mention", style="%s">@%s</a>',
-            $info['user_id'],
+            '<a href="%s" class="comment__mention", style="%s">@%s</a>',
+            url('user-profile', ['user' => $info['user_id']]),
             html_colour($info['user_colour']),
             $info['username']
         );