diff --git a/Core/src/org/tbasket/endpoint/Endpoint.scala b/Core/src/org/tbasket/endpoint/Endpoint.scala
index 70a1a44..595175d 100644
--- a/Core/src/org/tbasket/endpoint/Endpoint.scala
+++ b/Core/src/org/tbasket/endpoint/Endpoint.scala
@@ -12,7 +12,7 @@ import org.tbasket.dispatch.StaticWebService
 import org.tbasket.endpoint.Endpoint.{Log, app}
 import org.tbasket.error.*
 import EndpointUtils.errorBody
-import org.tbasket.endpoint.auth.{LoginHandler, RegisterHandler}
+import org.tbasket.endpoint.auth.{LoginHandler, RegisterHandler, TokenLoginHandler}
 import zio.*
 import zio.http.*
 import zio.http.ServerConfig.LeakDetectionLevel
@@ -50,10 +50,13 @@ object Endpoint:
   final val Log = LogManager.getLogger("API")
   
   private def tryHandle(r: Request) = r match
-    case r@POST -> _ / "login" =>
+    case r@POST -> _ / "auth" / "login" =>
       LoginHandler.login(r)
-    
-    case r@POST -> _ / "register" =>
+
+    case r@POST -> _ / "auth" / "token-login" =>
+      TokenLoginHandler.login(r)
+
+    case r@POST -> _ / "auth" / "register" =>
       RegisterHandler.register(r)
     
     case r@GET -> _ =>
diff --git a/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala b/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala
index 41b3d96..6ce72a8 100644
--- a/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala
+++ b/Core/src/org/tbasket/endpoint/auth/TokenLoginHandler.scala
@@ -2,7 +2,7 @@ package org.tbasket.endpoint.auth
 
 import zio.http.Request
 
-class TokenLoginHandler {
+object TokenLoginHandler {
   
   def login(request: Request) = {