diff --git a/auth.go b/auth.go
index 9e29bd9..f7af612 100644
--- a/auth.go
+++ b/auth.go
@@ -207,8 +207,8 @@ func AuthAuthenticate(app *App) func(c echo.Context) error {
 		}
 
 		var userResponse *UserResponse
-		if p, ok := player.Get(); ok && req.RequestUser {
-			id, err := UUIDToID(p.UUID)
+		if req.RequestUser {
+			id, err := UUIDToID(user.UUID)
 			if err != nil {
 				return err
 			}
diff --git a/auth_test.go b/auth_test.go
index 94f21ef..86daea0 100644
--- a/auth_test.go
+++ b/auth_test.go
@@ -215,7 +215,7 @@ func (ts *TestSuite) testAuthenticate(t *testing.T) {
 		assert.Nil(t, ts.App.DB.Preload("User").First(&player, "name = ?", TEST_PLAYER_NAME).Error)
 
 		expectedUser := UserResponse{
-			ID: Unwrap(UUIDToID(player.UUID)),
+			ID: Unwrap(UUIDToID(player.User.UUID)),
 			Properties: []UserProperty{{
 				Name:  "preferredLanguage",
 				Value: player.User.PreferredLanguage,