diff --git a/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt b/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt
index 33135d9f..3f07d42d 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt
+++ b/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt
@@ -285,5 +285,5 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
     fun hasPassword() = password != null
 
     fun generateHash(password: String, salt: ByteArray): ByteArray =
-        PBEKeySpec(password.toCharArray(), salt, 65536, 128).let { factory.generateSecret(it).encoded }
+        PBEKeySpec(password.toCharArray(), salt, 65536, 512).let { factory.generateSecret(it).encoded }
 }
\ No newline at end of file
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Token.kt b/CommonCore/SQL/src/de/steamwar/sql/Token.kt
index 1c0539ab..2153a298 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Token.kt
+++ b/CommonCore/SQL/src/de/steamwar/sql/Token.kt
@@ -81,7 +81,7 @@ class Token(id: EntityID<Int>): IntEntity(id) {
 
     var name by TokenTable.name
         private set
-    var owner by SteamwarUser referencedOn TokenTable.owner
+    var owner by TokenTable.owner.memoizedTransform({ it.id }, { SteamwarUser.byId(it.value)!! })
         private set
     var created by TokenTable.created.transform({ it.toInstant() }, { Timestamp.from(it) })
         private set
diff --git a/WebsiteBackend/src/de/steamwar/routes/Data.kt b/WebsiteBackend/src/de/steamwar/routes/Data.kt
index 5f2ce465..9cc7be0c 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Data.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Data.kt
@@ -27,6 +27,7 @@ import de.steamwar.sql.SchematicType
 import de.steamwar.sql.SteamwarUser
 import de.steamwar.sql.Team
 import de.steamwar.sql.UserPerm
+import de.steamwar.sql.internal.useDb
 import de.steamwar.util.fetchData
 import io.ktor.http.*
 import io.ktor.server.application.*
@@ -75,7 +76,7 @@ fun Route.configureDataRoutes() {
                 permission = UserPerm.MODERATION
             }
             get("/users") {
-                call.respond(SteamwarUser.all().map { ResponseUser.get(it) })
+                call.respond(useDb { SteamwarUser.all().map { ResponseUser.get(it) } })
             }
             get("/teams") {
                 call.respond(Team.getAll().map { ResponseTeam(it) })