diff --git a/go.mod b/go.mod
index 3c687c6..1cb1312 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module git.kundeng.us/phoenix/textsender-auth
 go 1.25.4
 
 require (
-	git.kundeng.us/phoenix/textsender-models v0.0.10
+	git.kundeng.us/phoenix/textsender-models v0.0.11-16-f9b55b6bb7-556
 	github.com/go-chi/chi/v5 v5.2.3
 	github.com/go-chi/cors v1.2.2
 	github.com/golang-jwt/jwt/v5 v5.3.0
diff --git a/go.sum b/go.sum
index accaf7e..6b03a8f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-git.kundeng.us/phoenix/textsender-models v0.0.10 h1:0AMe/zm4Xte2BcuqqhRP7+42m+4To+rUnHkR2a9eXlI=
-git.kundeng.us/phoenix/textsender-models v0.0.10/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
+git.kundeng.us/phoenix/textsender-models v0.0.11-16-f9b55b6bb7-556 h1:zDoezot79fzI4voSW02O4/o2p1lBzmQ2Gq8Ukub8460=
+git.kundeng.us/phoenix/textsender-models v0.0.11-16-f9b55b6bb7-556/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
diff --git a/internal/utility/token.go b/internal/utility/token.go
index c241ff0..6a69169 100644
--- a/internal/utility/token.go
+++ b/internal/utility/token.go
@@ -6,8 +6,8 @@ import (
 
 	"git.kundeng.us/phoenix/textsender-models/tx0/token"
 	"git.kundeng.us/phoenix/textsender-models/tx0/user"
-	"github.com/google/uuid"
 	"github.com/golang-jwt/jwt/v5"
+	"github.com/google/uuid"
 
 	"git.kundeng.us/phoenix/textsender-auth/internal/config"
 )
@@ -16,7 +16,7 @@ const ROLE_TYPE = "regular"
 const TOKEN_TYPE = "Bearer"
 
 type TokenGenerator struct {
-	SecretKey []byte
+	SecretKey  []byte
 	hourOffset time.Duration
 }
 
@@ -48,7 +48,7 @@ func (t *TokenGenerator) GenerateToken(usr any) (*token.Login, error) {
 		if tokenString, err := myToken.SignedString(t.SecretKey); err != nil {
 			return nil, err
 		} else {
-			return &token.Login{AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil
+			return &token.Login{UserId: claims.UserId, AccessToken: tokenString, TokenType: TOKEN_TYPE, ExpiresIn: expirationTime.Unix()}, nil
 		}
 	}
 }
@@ -97,11 +97,10 @@ func (t *TokenGenerator) ExtractIdFromToken(accessToken string) (uuid.UUID, erro
 	}
 }
 
-
 func (t *TokenGenerator) parseTokenWithClaims(accessToken string, claims *token.Claims) (*jwt.Token, error) {
 	tken, err := jwt.ParseWithClaims(accessToken, claims, func(tken *jwt.Token) (any, error) {
 		if _, ok := tken.Method.(*jwt.SigningMethodHMAC); !ok {
-		    return nil, fmt.Errorf("unexpected signing method: %v", tken.Header["alg"])
+			return nil, fmt.Errorf("unexpected signing method: %v", tken.Header["alg"])
 		}
 		return t.SecretKey, nil
 	}, jwt.WithValidMethods([]string{jwt.SigningMethodHS256.Alg()}))