diff --git a/.gitmodules b/.gitmodules
index ef78831..451f83f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "x"]
 	path = x
-	url = https://forge.capytal.company/loreddev/x
+	url = git@192.168.0.110:loreddev/x
diff --git a/comicverse.go b/comicverse.go
index b9c530e..2ce4e54 100644
--- a/comicverse.go
+++ b/comicverse.go
@@ -127,18 +127,22 @@ func (app *app) setup() error {
 	app.assert.NotNil(app.assets)
 	app.assert.NotNil(app.logger)
 
-	userRepo, err := repository.NewUserRepository(app.db, app.ctx, app.logger, app.assert)
+	userRepository, err := repository.NewUser(app.ctx, app.db, app.logger.WithGroup("repository.user"), app.assert)
 	if err != nil {
-		return err
+		return errors.Join(errors.New("app: failed to start user repository"), err)
 	}
 
-	userService, err := service.NewUserService(userRepo, app.assert)
+	tokenRepository, err := repository.NewToken(app.ctx, app.db, app.logger.WithGroup("repository.logger"), app.assert)
 	if err != nil {
-		return err
+		return errors.Join(errors.New("app: failed to start token repository"), err)
 	}
 
+	userService := service.NewUser(userRepository, app.logger.WithGroup("service.user"), app.assert)
+	tokenService := service.NewToken(tokenRepository, app.logger.WithGroup("service.token"), app.assert)
+
 	app.handler, err = router.New(router.Config{
 		UserService: userService,
+		TokenService: tokenService,
 
 		Templates:    app.templates,
 		DisableCache: app.developmentMode,
diff --git a/model/model.go b/model/model.go
index 9bdd114..b2329b1 100644
--- a/model/model.go
+++ b/model/model.go
@@ -31,10 +31,10 @@ func (err ErrInvalidValue) Error() string {
 	var msg string
 
 	if err.Name != "" {
-		msg = fmt.Sprintf("%q has", err.Name)
+		msg = fmt.Sprintf("%q has ", err.Name)
 	}
 
-	msg = msg + " incorrect value"
+	msg = msg + "incorrect value"
 
 	if err.Actual != nil {
 		msg = msg + fmt.Sprintf(" %q", err.Actual)