diff --git a/internal/auth/routes.go b/internal/auth/routes.go
index b66d8a8..c2fac32 100644
--- a/internal/auth/routes.go
+++ b/internal/auth/routes.go
@@ -78,7 +78,15 @@ func CallbackHandler(mux *http.ServeMux) {
 			return
 		}
 
-		jwt, err := NewJWT(idtoken.Subject)
+		var UsernameClaim struct {
+			PreferredUsername string `json:"preferred_username"`
+		}
+		if err := idtoken.Claims(&UsernameClaim); err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		jwt, err := NewJWT(UsernameClaim.PreferredUsername)
 
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)