diff --git a/app/Utils/AuthTokenUtil.php b/app/Utils/AuthTokenUtil.php
index c787c39b3..8fa4c18bb 100644
--- a/app/Utils/AuthTokenUtil.php
+++ b/app/Utils/AuthTokenUtil.php
@@ -222,9 +222,9 @@ public static function getTokensForUser(int $user_id): Collection
      */
     public static function getAllTokens(): Collection
     {
-        return AuthToken::select('authtoken.*', 'project.name AS projectname', 'user.firstname AS owner_firstname', 'user.lastname AS owner_lastname')
+        return AuthToken::select('authtoken.*', 'project.name AS projectname', 'users.firstname AS owner_firstname', 'users.lastname AS owner_lastname')
             ->leftJoin('project', 'project.id', '=', 'authtoken.projectid')
-            ->leftJoin('users', 'user.id', '=', 'authtoken.userid')
+            ->leftJoin('users', 'users.id', '=', 'authtoken.userid')
             ->get();
     }
 
diff --git a/config/cdash.php b/config/cdash.php
index 05a919788..98ae62b12 100755
--- a/config/cdash.php
+++ b/config/cdash.php
@@ -23,7 +23,7 @@
         'expires' => env('PASSWORD_EXPIRATION', 0),
         'unique' => env('UNIQUE_PASSWORD_COUNT', 0),
     ],
-    'version' => '3.6.2',
+    'version' => '3.7.0',
     'registration' => [
         'email' => [
             'verify' => env('REGISTRATION_EMAIL_VERIFY', true),
diff --git a/package-lock.json b/package-lock.json
index de7900248..b34a64d82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cdash",
-  "version": "3.6.2",
+  "version": "3.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cdash",
-      "version": "3.6.2",
+      "version": "3.7.0",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@apollo/client": "^3.12.4",
diff --git a/package.json b/package.json
index 6711f48ec..6bfaa0384 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cdash",
-  "version": "3.6.2",
+  "version": "3.7.0",
   "description": "Continuous integration dashboard.",
   "repository": "https://github.com/Kitware/CDash",
   "license": "BSD-3-Clause",